From 0f139753e34d5a12ba4d5cc8ea1b5675c833f6b7 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Mon, 8 Jul 2024 16:28:55 -0600 Subject: [PATCH 001/198] Issue #667: adding support for --terse_show_extenstions --- src/ml_cmd.in.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ml_cmd.in.lua b/src/ml_cmd.in.lua index 0e31940f6..8692a5c5e 100644 --- a/src/ml_cmd.in.lua +++ b/src/ml_cmd.in.lua @@ -153,6 +153,7 @@ function main() ["--redirect"] = 0, ["--no_redirect"] = 0, ["--no-redirect"] = 0, ["--spider_timeout"] = 1, ["--spider-timeout"] = 1, ["--terse"] = 0, ["-t"] = 0, + ["--terse_show_extensions"] = 0, ["-t"] = 0, ["--timer"] = 0, ["--trace"] = 0, ["-T"] = 0, ["--version"]=0, ["--versoin"]=0, ["--ver"]=0, ["--v"]=0, ["-v"]=0, From 828b4a19a03a326c90896bfd166cc4fef742f6a9 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Tue, 9 Jul 2024 12:35:31 -0600 Subject: [PATCH 002/198] Issue #667: adding provides to availA output --- src/Hub.lua | 2 ++ src/ModuleA.lua | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Hub.lua b/src/Hub.lua index c5cf4c569..b41958954 100644 --- a/src/Hub.lua +++ b/src/Hub.lua @@ -1253,6 +1253,8 @@ function M.avail(self, argA) local alias2modT = mrc:getAlias2ModT(mpathA) local showSN = not defaultOnly + dbg.printT("availA",availA) + if (showSN) then showSN = argA.n == 0 end diff --git a/src/ModuleA.lua b/src/ModuleA.lua index cfceb7ca4..5de2abaa5 100644 --- a/src/ModuleA.lua +++ b/src/ModuleA.lua @@ -379,7 +379,8 @@ function M.build_availA(self) for fullName, vv in pairs(v.fileT) do if (show_hidden or mrc:isVisible{fullName=fullName,sn=sn,fn=vv.fn}) then icnt = icnt + 1 - A[icnt] = { fullName = fullName, pV = pathJoin(sn,vv.pV), fn = vv.fn, sn = sn, propT = vv.propT} + A[icnt] = { fullName = fullName, pV = pathJoin(sn,vv.pV), fn = vv.fn, sn = sn, + propT = vv.propT, provides = vv.provides} end end end From 75227257df104ced6756060a51d40fb0c09f8046 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Wed, 10 Jul 2024 15:49:31 -0600 Subject: [PATCH 003/198] Always check for nil before trim() --- src/MainControl.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/MainControl.lua b/src/MainControl.lua index 1fb030491..98fc0615c 100644 --- a/src/MainControl.lua +++ b/src/MainControl.lua @@ -313,7 +313,7 @@ end -- @param value the environment variable value. -- @param respect If true, then respect the old value. function M.setenv(self, name, value, respect) - name = name:trim() + name = (name or ""):trim() dbg.start{"MainControl:setenv(\"",name,"\", \"",value,"\", \"", respect,"\")"} @@ -394,7 +394,7 @@ end -- @param name the environment variable name. -- @param value the environment variable value. function M.pushenv(self, name, value) - name = name:trim() + name = (name or ""):trim() dbg.start{"MainControl:pushenv(\"",name,"\", \"",value,"\")"} l_check_for_valid_name("pushenv",name) @@ -450,7 +450,7 @@ end -- @param name the environment variable name. -- @param value the environment variable value. function M.popenv(self, name, value) - name = name:trim() + name = (name or ""):trim() dbg.start{"MainControl:popenv(\"",name,"\", \"",value,"\")"} l_check_for_valid_name("popenv",name) @@ -614,7 +614,7 @@ end -- @param name the environment variable name. -- @param value the environment variable value. function M.set_alias(self, name, value) - name = name:trim() + name = (name or ""):trim() dbg.start{"MainControl:set_alias(\"",name,"\", \"",value,"\")"} l_check_for_valid_alias_name("set_alias",name) @@ -636,7 +636,7 @@ end -- @param name the environment variable name. -- @param value the environment variable value. function M.unset_alias(self, name, value) - name = name:trim() + name = (name or ""):trim() dbg.start{"MainControl:unset_alias(\"",name,"\", \"",value,"\")"} local frameStk = FrameStk:singleton() @@ -656,7 +656,7 @@ end -- @param name the environment variable name. -- @param value the environment variable value. function M.set_shell_function(self, name, bash_function, csh_function) - name = name:trim() + name = (name or ""):trim() dbg.start{"MainControl:set_shell_function(\"",name,"\", \"",bash_function,"\"", "\", \"",csh_function,"\""} @@ -679,7 +679,7 @@ end -- @param name the environment variable name. -- @param value the environment variable value. function M.unset_shell_function(self, name, bash_function, csh_function) - name = name:trim() + name = (name or ""):trim() dbg.start{"MainControl:unset_shell_function(\"",name,"\", \"",bash_function,"\"", "\", \"",csh_function,"\""} @@ -1620,7 +1620,7 @@ function M.add_property(self, name, value) local sn = frameStk:sn() local mt = frameStk:mt() l_check_for_valid_name("add_property",name) - mt:add_property(sn, name:trim(), value) + mt:add_property(sn, (name or ""):trim(), value) end @@ -1634,7 +1634,7 @@ function M.remove_property(self, name, value) local sn = frameStk:sn() local mt = frameStk:mt() l_check_for_valid_name("remove_property",name) - mt:remove_property(sn, name:trim(), value) + mt:remove_property(sn, (name or ""):trim(), value) end From 549f90c43f67b8fe896e0c88429e51bf2676cbde Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 11 Jul 2024 12:25:19 -0600 Subject: [PATCH 004/198] Issue #667: Writing out individual module extensions when requested with --terse_show_extensions --- init/lmod_bash_completions | 5 ++-- init/zsh/_ml | 4 ++++ init/zsh/_module | 8 +++++-- rt/terse_avail/err.txt | 6 ++--- src/Hub.lua | 49 ++++++++++++++++++-------------------- src/ml_cmd.in.lua | 5 ++-- 6 files changed, 42 insertions(+), 35 deletions(-) diff --git a/init/lmod_bash_completions b/init/lmod_bash_completions index 1d1286f50..2c80f089f 100644 --- a/init/lmod_bash_completions +++ b/init/lmod_bash_completions @@ -127,7 +127,7 @@ _module() { --quiet --terse --version --default --width -r --regexp --mt --latest \ -I --ignore_cache --gitversion --dumpversion --config --miniConfig \ --timer -f --force --redirect --show_hidden -T --trace --nx \ - --no_extensions" + --no_extensions --loc --location --terse_show_extensions --pod " case "${prev}" in add|load|try-load) @@ -193,7 +193,8 @@ _ml() { opts="-d -D -h -q -t -v -w -s --style --expert --quiet --help -H -f --force \ --quiet --terse --version --default --Verbose --width -r --regexp --mt \ --gitversion --ignore_cache -I --latest --pin_version --trace -T --config \ - --miniConfig --config_json --raw --show_hidden" + --miniConfig --config_json --raw --show_hidden --loc --location \ + --terse_show_extensions --pod" case "${prev}" in rm|remove|unload|switch|swap) diff --git a/init/zsh/_ml b/init/zsh/_ml index 198c96463..f4b25ea51 100644 --- a/init/zsh/_ml +++ b/init/zsh/_ml @@ -24,17 +24,21 @@ _ml() '--config[display full Lmod configuration]' '--config_json[display full Lmod configuration in json format]' '--force[force the removal of a sticky module or save an empty collection]' + "--gitversion[Report Lmod's git version]" '--latest[Load latest (ignore default)]' '--location[Print the file location only when using show]' '--miniConfig[display configuration differences from default]' '--mt[display the module table]' '--no_redirect[send messages to stderr]' '--old_style[Use multiple module commands when mixing loads and unload]' + '--pin_version[pin versions when restoring a collection]' + '--pod[generate pod format for manpage generation]' '--raw[Print raw contents of a modulefile when using show]' '--redirect[send messages to stdout]' '--show_hidden[avail and spider will report hidden modules]' '--style[]' '--timer[report run times]' + '--terse_show_extensions[Include module extensions in terse avail output]' ) for arg in $arguments; do diff --git a/init/zsh/_module b/init/zsh/_module index 9b42c255c..d41500ec0 100644 --- a/init/zsh/_module +++ b/init/zsh/_module @@ -9,27 +9,31 @@ _module() '(- *)'{--version,-v}'[module command version]' \ '(-D --debug)'{--debug,-D}'[Send program tracing information to stderr]' \ '(-I --ignore_cache)'{--ignore_cache,-I}'[Treat the cache file(s) as out-of-date]' \ + '(-T --trace)'{--style,-s}'[Report major internal actions by Lmod]' \ '(-d --default)'{--default,-d}'[List default modules only when used with avail]' \ + '(-f --force)'{--force,-f}'Force removal of a sticky module or save an empty collection]' \ '(-q --quiet)'{--quiet,-q}'[disable verbose messages]' \ '(-r --regexp)'{--regexp,-r}'[lua regular expression matching]' \ '(-s --style)'{--style,-s}'[avail output style]' \ '(-t --terse)'{--terse,-t}'[display avail, list and spider output in short format]' \ '(-w --width)'{--width,-w}'[use given width for max term width]' \ - '--Verbose[show generated module command]' \ '--config[display full Lmod configuration]' \ '--config_json[display full Lmod configuration in json format]' \ '--force[force the removal of a sticky module or save an empty collection]' \ + "--gitversion[Report Lmod's git version]" \ '--latest[Load latest (ignore default)]' \ '--location[Print the file location only when using show]' \ '--miniConfig[display configuration differences from default]' \ '--mt[display the module table]' \ '--no_redirect[send messages to stderr]' \ - '--old_style[Use multiple module commands when mixing loads and unload]' \ + '--pin_version[pin versions when restoring a collection]' \ + '--pod[generate pod format for manpage generation]' \ '--raw[Print raw contents of a modulefile when using show]' \ '--redirect[send messages to stdout]' \ '--show_hidden[avail and spider will report hidden modules]' \ '--style[]' \ '--timer[report run times]' \ + '--terse_show_extensions[Include module extensions in terse avail output]' \ '*::module command:_module_command' } diff --git a/rt/terse_avail/err.txt b/rt/terse_avail/err.txt index d1e4d2d5f..3a2b4c256 100644 --- a/rt/terse_avail/err.txt +++ b/rt/terse_avail/err.txt @@ -2,7 +2,7 @@ step 1 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version =========================== -Modules based on Lua: Version 8.7.40 2024-06-11 15:18 -06:00 +Modules based on Lua: Version 8.7.43 2024-06-24 15:50 -06:00 by Robert McLay mclay@tacc.utexas.edu =========================== step 2 @@ -62,11 +62,11 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing --terse_show_extension ProjectDIR/rt/terse_avail/mf/Compiler/intel/19: python/ python/3.7 +# CC/3.1 +# DDD/4.1 ProjectDIR/rt/terse_avail/mf/Core: TACC gcc/ gcc/9.4 intel/ intel/19.1 -# CC -# DDD diff --git a/src/Hub.lua b/src/Hub.lua index b41958954..b93fdd99f 100644 --- a/src/Hub.lua +++ b/src/Hub.lua @@ -859,6 +859,7 @@ local function l_availEntry(defaultOnly, label, searchA, defaultT, entry) local fullName = entry.fullName local sn = entry.sn local fn = entry.fn + local provideA = entry.provides if (searchA.n > 0) then found = false for i = 1, searchA.n do @@ -874,7 +875,7 @@ local function l_availEntry(defaultOnly, label, searchA, defaultT, entry) end end if (found) then - return sn, fullName, fn + return sn, fullName, fn, provideA end return nil, nil end @@ -1011,8 +1012,8 @@ function M.overview(self,argA) end availA = regroup_avail_blocks(availStyle, availA) - local providedByT = false - self:terse_avail(mpathA, availA, alias2modT, searchA, showSN, defaultOnly, defaultT, providedByT, aa) + local showModuleExt = false + self:terse_avail(mpathA, availA, alias2modT, searchA, showSN, defaultOnly, defaultT, showModuleExt, aa) local label = "" local a = {} @@ -1141,7 +1142,7 @@ function M.buildExtA(self, searchA, mpathA, providedByT, extA) dbg.fini("Hub:buildExtA()") end -function M.terse_avail(self, mpathA, availA, alias2modT, searchA, showSN, defaultOnly, defaultT, providedByT, a) +function M.terse_avail(self, mpathA, availA, alias2modT, searchA, showSN, defaultOnly, defaultT, showModuleExt, a) dbg.start{"Hub:terse_avail()"} local mrc = MRC:singleton() local optionTbl = optionTbl() @@ -1171,7 +1172,7 @@ function M.terse_avail(self, mpathA, availA, alias2modT, searchA, showSN, defaul local prtSnT = {} -- Mark if we have printed the sn? for i = 1,#A do - local sn, fullName, fn = l_availEntry(defaultOnly, label, searchA, defaultT, A[i]) + local sn, fullName, fn, provideA = l_availEntry(defaultOnly, label, searchA, defaultT, A[i]) if (sn) then if (not prtSnT[sn] and sn ~= fullName and showSN) then prtSnT[sn] = true @@ -1185,6 +1186,11 @@ function M.terse_avail(self, mpathA, availA, alias2modT, searchA, showSN, defaul end end aa[#aa+1] = fullName .. "\n" + if (showModuleExt and provideA and next(provideA) ~= nil ) then + for k = 1,#provideA do + aa[#aa+1] = "# " .. provideA[k] .. "\n" + end + end end end if (next(aa) ~= nil) then @@ -1197,17 +1203,17 @@ function M.terse_avail(self, mpathA, availA, alias2modT, searchA, showSN, defaul -- if providedByT is not false then output - if (providedByT and next(providedByT) ~= nil ) then - - local extA = {} - self:buildExtA(searchA, mpathA, providedByT, extA) - - for i=1,#extA do - a[#a+1] = "#" - a[#a+1] = extA[i][1] - a[#a+1] = "\n" - end - end + --if (providedByT and next(providedByT) ~= nil ) then + -- + -- local extA = {} + -- self:buildExtA(searchA, mpathA, providedByT, extA) + -- + -- for i=1,#extA do + -- a[#a+1] = "#" + -- a[#a+1] = extA[i][1] + -- a[#a+1] = "\n" + -- end + --end dbg.fini("Hub:terse_avail") return a @@ -1281,17 +1287,8 @@ function M.avail(self, argA) if (optionTbl.terse or optionTbl.terseShowExtensions) then -------------------------------------------------- -- Terse output - local spiderT = false - local dbT = false - local mpathMapT = false - local providedByT = false - if (optionTbl.terseShowExtensions) then - local cache = Cache:singleton{buildCache=true} - spiderT,dbT, mpathMapT, providedByT = cache:build() - end - self:terse_avail(mpathA, availA, alias2modT, searchA, showSN, - defaultOnly, defaultT, providedByT, a) + defaultOnly, defaultT, optionTbl.terseShowExtensions, a) dbg.fini("Hub:avail") return a diff --git a/src/ml_cmd.in.lua b/src/ml_cmd.in.lua index 8692a5c5e..4ce77408e 100644 --- a/src/ml_cmd.in.lua +++ b/src/ml_cmd.in.lua @@ -147,13 +147,14 @@ function main() ["--latest"] = 0, ["--localvar"]=1, ["--location"]=0, ["--loc"] = 0, - ["--pin_versions"]=0, ["--pin-versions"]=0, ["--mt"] = 0, + ["--pin_versions"]=0, ["--pin-versions"]=0, + ["--pod"] = 0, ["--quiet"] = 0, ["-q"] = 0, ["--redirect"] = 0, ["--no_redirect"] = 0, ["--no-redirect"] = 0, ["--spider_timeout"] = 1, ["--spider-timeout"] = 1, ["--terse"] = 0, ["-t"] = 0, - ["--terse_show_extensions"] = 0, ["-t"] = 0, + ["--terse_show_extensions"] = 0, ["--timer"] = 0, ["--trace"] = 0, ["-T"] = 0, ["--version"]=0, ["--versoin"]=0, ["--ver"]=0, ["--v"]=0, ["-v"]=0, From 84d0129c9a19859b858b156e1cf0d2fe683258d2 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 11 Jul 2024 12:40:41 -0600 Subject: [PATCH 005/198] fix for --force option --- init/zsh/_module | 1 - 1 file changed, 1 deletion(-) diff --git a/init/zsh/_module b/init/zsh/_module index d41500ec0..0a3580129 100644 --- a/init/zsh/_module +++ b/init/zsh/_module @@ -19,7 +19,6 @@ _module() '(-w --width)'{--width,-w}'[use given width for max term width]' \ '--config[display full Lmod configuration]' \ '--config_json[display full Lmod configuration in json format]' \ - '--force[force the removal of a sticky module or save an empty collection]' \ "--gitversion[Report Lmod's git version]" \ '--latest[Load latest (ignore default)]' \ '--location[Print the file location only when using show]' \ From 437281920b5e3fbe73e36b11a848f98997aeb41d Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 11 Jul 2024 12:41:45 -0600 Subject: [PATCH 006/198] fix for --force option --- init/zsh/_ml | 1 - 1 file changed, 1 deletion(-) diff --git a/init/zsh/_ml b/init/zsh/_ml index f4b25ea51..d5d14625b 100644 --- a/init/zsh/_ml +++ b/init/zsh/_ml @@ -23,7 +23,6 @@ _ml() '--Verbose[show generated module command]' '--config[display full Lmod configuration]' '--config_json[display full Lmod configuration in json format]' - '--force[force the removal of a sticky module or save an empty collection]' "--gitversion[Report Lmod's git version]" '--latest[Load latest (ignore default)]' '--location[Print the file location only when using show]' From 33f844a8d0647e92d64475da07ae3f706c86456f Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 11 Jul 2024 12:44:19 -0600 Subject: [PATCH 007/198] fix for --force option --- init/zsh/_ml | 2 +- init/zsh/_module | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/init/zsh/_ml b/init/zsh/_ml index d5d14625b..46b5fac7f 100644 --- a/init/zsh/_ml +++ b/init/zsh/_ml @@ -14,7 +14,7 @@ _ml() '(-I --ignore_cache)'{--ignore_cache,-I}'[Treat the cache file(s) as out-of-date]' '(-T --trace)'{--style,-s}'[Report major internal actions by Lmod]' '(-d --default)'{--default,-d}'[List default modules only when used with avail]' - '(-f --force)'{--force,-f}'Force removal of a sticky module or save an empty collection]' + '(-f --force)'{--force,-f}'[Force removal of a sticky module or save an empty collection]' '(-q --quiet)'{--quiet,-q}'[disable verbose messages]' '(-r --regexp)'{--regexp,-r}'[lua regular expression matching]' '(-s --style)'{--style,-s}'[avail output style]' diff --git a/init/zsh/_module b/init/zsh/_module index 0a3580129..d2ae5ea3f 100644 --- a/init/zsh/_module +++ b/init/zsh/_module @@ -11,7 +11,7 @@ _module() '(-I --ignore_cache)'{--ignore_cache,-I}'[Treat the cache file(s) as out-of-date]' \ '(-T --trace)'{--style,-s}'[Report major internal actions by Lmod]' \ '(-d --default)'{--default,-d}'[List default modules only when used with avail]' \ - '(-f --force)'{--force,-f}'Force removal of a sticky module or save an empty collection]' \ + '(-f --force)'{--force,-f}'[Force removal of a sticky module or save an empty collection]' \ '(-q --quiet)'{--quiet,-q}'[disable verbose messages]' \ '(-r --regexp)'{--regexp,-r}'[lua regular expression matching]' \ '(-s --style)'{--style,-s}'[avail output style]' \ From 1071bceda1b620cfc8509b3c6d3fb3d31ca0fba7 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 11 Jul 2024 12:48:24 -0600 Subject: [PATCH 008/198] fix for --trace option --- init/zsh/_ml | 2 +- init/zsh/_module | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/init/zsh/_ml b/init/zsh/_ml index 46b5fac7f..842ee284a 100644 --- a/init/zsh/_ml +++ b/init/zsh/_ml @@ -12,7 +12,7 @@ _ml() '(- *)'{--version,-v}'[module command version]' '(-D --debug)'{--debug,-D}'[Send program tracing information to stderr]' '(-I --ignore_cache)'{--ignore_cache,-I}'[Treat the cache file(s) as out-of-date]' - '(-T --trace)'{--style,-s}'[Report major internal actions by Lmod]' + '(-T --trace)'{--trace,-T}'[Report major internal actions by Lmod]' '(-d --default)'{--default,-d}'[List default modules only when used with avail]' '(-f --force)'{--force,-f}'[Force removal of a sticky module or save an empty collection]' '(-q --quiet)'{--quiet,-q}'[disable verbose messages]' diff --git a/init/zsh/_module b/init/zsh/_module index d2ae5ea3f..6b9abfc2d 100644 --- a/init/zsh/_module +++ b/init/zsh/_module @@ -9,7 +9,7 @@ _module() '(- *)'{--version,-v}'[module command version]' \ '(-D --debug)'{--debug,-D}'[Send program tracing information to stderr]' \ '(-I --ignore_cache)'{--ignore_cache,-I}'[Treat the cache file(s) as out-of-date]' \ - '(-T --trace)'{--style,-s}'[Report major internal actions by Lmod]' \ + '(-T --trace)'{--trace,-T}'[Report major internal actions by Lmod]' \ '(-d --default)'{--default,-d}'[List default modules only when used with avail]' \ '(-f --force)'{--force,-f}'[Force removal of a sticky module or save an empty collection]' \ '(-q --quiet)'{--quiet,-q}'[disable verbose messages]' \ From 5ad008afdb25e9606cdd0cd5d38d5c7431f418ac Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 11 Jul 2024 13:44:22 -0600 Subject: [PATCH 009/198] cleanup on terse_avail test --- rt/terse_avail/terse_avail.tdesc | 3 --- 1 file changed, 3 deletions(-) diff --git a/rt/terse_avail/terse_avail.tdesc b/rt/terse_avail/terse_avail.tdesc index a913bceb3..78a8e0413 100644 --- a/rt/terse_avail/terse_avail.tdesc +++ b/rt/terse_avail/terse_avail.tdesc @@ -24,9 +24,6 @@ testdescript = { remove_generated_lmod_files - cp $(testDir)/.lmodrc.lua .lmodrc.lua - - runLmod --version # 1 runLmod load intel # 2 runLmod avail # 3 From 8d68c7d8e68f08e53d94da532098ce6930caa6d1 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 11 Jul 2024 16:39:06 -0600 Subject: [PATCH 010/198] moving to TAG_VERSION 8.7.44 --- .versionDate | 2 +- docs/source/conf.py | 3 ++- settarg/Version.lua | 6 +++--- src/Version.lua | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.versionDate b/.versionDate index c76f8a49e..c547e16b8 100644 --- a/.versionDate +++ b/.versionDate @@ -1 +1 @@ -2024-06-24 15:50 -06:00 +2024-07-11 16:39 -06:00 diff --git a/docs/source/conf.py b/docs/source/conf.py index 33d2baa68..35a86501a 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -57,7 +57,7 @@ # The short X.Y version. version = '8.7' # The full version, including alpha/beta/rc tags. -release = '8.7.43' +release = '8.7.44' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -397,5 +397,6 @@ + diff --git a/settarg/Version.lua b/settarg/Version.lua index 3da508322..9fe6d4acc 100644 --- a/settarg/Version.lua +++ b/settarg/Version.lua @@ -9,14 +9,14 @@ function M.branchStr() end return s == "" and s or "[branch: "..s.."]" end -function M.tag() return "8.7.43" end +function M.tag() return "8.7.44" end function M.git() - local s = "8.7.43" + local s = "8.7.44" if (s == "@" .. "git@") then s = "" end if (s == M.tag() ) then s = "" end return s == "" and s or "("..s..")" end -function M.date() return "2024-06-24 15:50 -06:00" end +function M.date() return "2024-07-11 16:39 -06:00" end function M.name() local a = {} a[#a+1] = M.tag() diff --git a/src/Version.lua b/src/Version.lua index 3da508322..9fe6d4acc 100644 --- a/src/Version.lua +++ b/src/Version.lua @@ -9,14 +9,14 @@ function M.branchStr() end return s == "" and s or "[branch: "..s.."]" end -function M.tag() return "8.7.43" end +function M.tag() return "8.7.44" end function M.git() - local s = "8.7.43" + local s = "8.7.44" if (s == "@" .. "git@") then s = "" end if (s == M.tag() ) then s = "" end return s == "" and s or "("..s..")" end -function M.date() return "2024-06-24 15:50 -06:00" end +function M.date() return "2024-07-11 16:39 -06:00" end function M.name() local a = {} a[#a+1] = M.tag() From 94d3286b00e979f2903c9acb7b6b56d23a1b939b Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 11 Jul 2024 16:46:10 -0600 Subject: [PATCH 011/198] Do not need -f and -I in translateT table --- src/ml_cmd.in.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ml_cmd.in.lua b/src/ml_cmd.in.lua index 4ce77408e..796e1f8e6 100644 --- a/src/ml_cmd.in.lua +++ b/src/ml_cmd.in.lua @@ -169,9 +169,6 @@ function main() } local translateT = { - ["-f"]="--force", - ["-I"]="--ignore_cache", - ["--loc"]="--location", ["--versoin"]="--version", ["--ver"]="--version", ["--v"]="--version", From 88c5c4f624e1da943bd5c581e189ad1ffd0d19e9 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 11 Jul 2024 21:27:44 -0600 Subject: [PATCH 012/198] Cleaning up README.new --- README.new | 1 - 1 file changed, 1 deletion(-) diff --git a/README.new b/README.new index dc32f4ea5..428aa3068 100644 --- a/README.new +++ b/README.new @@ -156,5 +156,4 @@ Lmod 8.7+ * ModuleTable modification: Changes to $MODULEPATH are stored in an entry. (8.7.42) * Fix setting of $FPATH when running bash or ksh shell and executing zsh -l. (8.7.43) * Support for ksh flag not needed anymore -W.I.P: (8.7.44) * Issue #710: path2pathA() keep double delims, Reduce triple delims to double From e3d8b1e806edcfeb4b3a91c89600548b2d5be510 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 11 Jul 2024 21:30:05 -0600 Subject: [PATCH 013/198] Organizing options for ml --- src/ml_cmd.in.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ml_cmd.in.lua b/src/ml_cmd.in.lua index 796e1f8e6..ce69fc054 100644 --- a/src/ml_cmd.in.lua +++ b/src/ml_cmd.in.lua @@ -133,11 +133,12 @@ function main() -- number of arguments the option requires local lmodOptT = { - ["--old_style"] = 0, ["-D"]=0, ["-?"] = 0, ["-h"] = 0, ["--help"] = 0, ["-H"] = 0, - ["--default"]=0, ["-d"]=0, ["--brief"]=0, ["-b"]=0, + ["--config"] = 0, + ["--config_json"] = 0, ["--config-json"] = 0, + ["--default"]=0, ["-d"]=0, ["--dumpversion"] = 0, ["--expert"]=0, ["--novice"]=0, ["--force"] = 0, ["-f"] = 0, @@ -147,25 +148,24 @@ function main() ["--latest"] = 0, ["--localvar"]=1, ["--location"]=0, ["--loc"] = 0, + ["--miniConfig"] = 0, ["--mt"] = 0, + ["--old_style"] = 0, ["--pin_versions"]=0, ["--pin-versions"]=0, ["--pod"] = 0, ["--quiet"] = 0, ["-q"] = 0, + ["--raw"] = 0, ["--redirect"] = 0, ["--no_redirect"] = 0, ["--no-redirect"] = 0, + ["--regexp"] = 0, ["-r"] = 0, + ["--show_hidden"] = 0, ["--show-hidden"] = 0, ["--spider_timeout"] = 1, ["--spider-timeout"] = 1, + ["--style"] = 1, ["-s"] = 1, ["--terse"] = 0, ["-t"] = 0, ["--terse_show_extensions"] = 0, ["--timer"] = 0, ["--trace"] = 0, ["-T"] = 0, ["--version"]=0, ["--versoin"]=0, ["--ver"]=0, ["--v"]=0, ["-v"]=0, - ['--config'] = 0, - ['--miniConfig'] = 0, - ['--config_json'] = 0, ['--config-json'] = 0, - ['--raw'] = 0, - ['--regexp'] = 0, ['-r'] = 0, - ['--show_hidden'] = 0, ['--show-hidden'] = 0, - ['--style'] = 1, ['-s'] = 1, - ['--width'] = 1, ['-w'] = 1, + ["--width"] = 1, ["-w"] = 1, } local translateT = { From 143f3acaaa280aa4eb7dea53bcbe62ade03356ce Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Mon, 15 Jul 2024 19:26:45 -0500 Subject: [PATCH 014/198] Issue #713: Changing MName.src: l_find_highest_by_key() to loop over all fileA entries. Now stoping at first one found rather than just looking at fileA[1]. --- README.new | 4 +++ rt/hidden/err.txt | 36 +++++++++++++++++++++- rt/hidden/hidden.tdesc | 8 +++++ rt/hidden/mf2/bottom/A/2.0.lua | 1 + rt/hidden/mf2/bottom/B/9.8.7.lua | 1 + rt/hidden/mf2/top/A/1.0.lua | 1 + rt/hidden/mf2/top/B/.9.8.7.lua | 1 + rt/hidden/out.txt | 42 ++++++++++++++++++++++++++ src/MName.lua | 52 ++++++++++++++++++-------------- 9 files changed, 122 insertions(+), 24 deletions(-) create mode 100644 rt/hidden/mf2/bottom/A/2.0.lua create mode 100644 rt/hidden/mf2/bottom/B/9.8.7.lua create mode 100644 rt/hidden/mf2/top/A/1.0.lua create mode 100644 rt/hidden/mf2/top/B/.9.8.7.lua diff --git a/README.new b/README.new index 428aa3068..9391c3bc3 100644 --- a/README.new +++ b/README.new @@ -157,3 +157,7 @@ Lmod 8.7+ (8.7.42) * Fix setting of $FPATH when running bash or ksh shell and executing zsh -l. (8.7.43) * Support for ksh flag not needed anymore (8.7.44) * Issue #710: path2pathA() keep double delims, Reduce triple delims to double +W.I.P: + (8.7.45) * Issue #713: Changing MName.src: l_find_highest_by_key() to loop over all fileA entries. + Now stoping at first one found rather than just looking at fileA[1]. + diff --git a/rt/hidden/err.txt b/rt/hidden/err.txt index a98400e01..5c6958b20 100644 --- a/rt/hidden/err.txt +++ b/rt/hidden/err.txt @@ -2,7 +2,7 @@ step 1 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version =========================== -Modules based on Lua: Version 8.6.9 2022-02-02 11:25 -04:00 +Modules based on Lua: Version 8.7.44 2024-07-11 16:39 -06:00 by Robert McLay mclay@tacc.utexas.edu =========================== step 2 @@ -31,3 +31,37 @@ Currently Loaded Modules: Where: H: Hidden Module S: Module is Sticky, requires --force to unload or purge +=========================== +step 5 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing purge +=========================== +The following modules were not unloaded: + (Use "module --force purge" to unload all): + 1) .system +=========================== +step 6 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing --show_hidden av +=========================== +ProjectDIR/rt/hidden/mf2/top + A/1.0 B/.9.8.7 (H) +ProjectDIR/rt/hidden/mf2/bottom + A/2.0 B/9.8.7 + Where: + H: Hidden Module +Module defaults are chosen based on Find First Rules due to Name/Version/Version modules found in the module tree. +See https://lmod.readthedocs.io/en/latest/060_locating.html for details. +If the avail list is too long consider trying: +"module --default avail" or "ml -d av" to just list the default modules. +"module overview" or "ml ov" to display the number of modules for each name. +Use "module spider" to find all possible modules and extensions. +Use "module keyword key1 key2 ..." to search for all possible modules matching any of the "keys". +=========================== +step 7 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load B +=========================== +=========================== +step 8 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing list +=========================== +Currently Loaded Modules: + 1) B/9.8.7 diff --git a/rt/hidden/hidden.tdesc b/rt/hidden/hidden.tdesc index 71c9833ef..5268c83d4 100644 --- a/rt/hidden/hidden.tdesc +++ b/rt/hidden/hidden.tdesc @@ -29,6 +29,14 @@ testdescript = { runLmod load .system # 3 runLmod list # 4 + runLmod purge # 5 + unsetMT + export MODULEPATH=$(testDir)/mf2/top:$(testDir)/mf2/bottom + export LMOD_TMOD_FIND_FIRST=1 + runLmod --show_hidden av # 6 + runLmod load B # 7 + runLmod list # 8 + HOME=$ORIG_HOME cat _stdout.[0-9][0-9][0-9] > _stdout.orig joinBase64Results -bash _stdout.orig _stdout.new diff --git a/rt/hidden/mf2/bottom/A/2.0.lua b/rt/hidden/mf2/bottom/A/2.0.lua new file mode 100644 index 000000000..8f7e0f02b --- /dev/null +++ b/rt/hidden/mf2/bottom/A/2.0.lua @@ -0,0 +1 @@ +setenv(myModuleName(),myModuleVersion()) diff --git a/rt/hidden/mf2/bottom/B/9.8.7.lua b/rt/hidden/mf2/bottom/B/9.8.7.lua new file mode 100644 index 000000000..8f7e0f02b --- /dev/null +++ b/rt/hidden/mf2/bottom/B/9.8.7.lua @@ -0,0 +1 @@ +setenv(myModuleName(),myModuleVersion()) diff --git a/rt/hidden/mf2/top/A/1.0.lua b/rt/hidden/mf2/top/A/1.0.lua new file mode 100644 index 000000000..8f7e0f02b --- /dev/null +++ b/rt/hidden/mf2/top/A/1.0.lua @@ -0,0 +1 @@ +setenv(myModuleName(),myModuleVersion()) diff --git a/rt/hidden/mf2/top/B/.9.8.7.lua b/rt/hidden/mf2/top/B/.9.8.7.lua new file mode 100644 index 000000000..8f7e0f02b --- /dev/null +++ b/rt/hidden/mf2/top/B/.9.8.7.lua @@ -0,0 +1 @@ +setenv(myModuleName(),myModuleVersion()) diff --git a/rt/hidden/out.txt b/rt/hidden/out.txt index 4ccd3541f..5f3e0f6c1 100644 --- a/rt/hidden/out.txt +++ b/rt/hidden/out.txt @@ -32,3 +32,45 @@ MODULEPATH=ProjectDIR/rt/hidden/mf; export MODULEPATH; _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={[".system"]={fn="ProjectDIR/rt/hidden/mf/.system.lua",fullName=".system",loadOrder=1,propT={lmod={sticky=1,},},stackDepth=0,status="active",userName=".system",wV="M.*zfinal",},},mpathA={"ProjectDIR/rt/hidden/mf",},systemBaseMPATH="ProjectDIR/rt/hidden/mf",}'; export _ModuleTable_; +=========================== +step 5 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing purge +=========================== +MODULEPATH=ProjectDIR/rt/hidden/mf; +export MODULEPATH; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={[".system"]={fn="ProjectDIR/rt/hidden/mf/.system.lua",fullName=".system",loadOrder=1,propT={lmod={sticky=1,},},stackDepth=0,status="active",userName=".system",wV="M.*zfinal",},},mpathA={"ProjectDIR/rt/hidden/mf",},systemBaseMPATH="ProjectDIR/rt/hidden/mf",}'; +export _ModuleTable_; +=========================== +step 6 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing --show_hidden av +=========================== +unset LOADEDMODULES; +__LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/hidden/mf2/top:1\;ProjectDIR/rt/hidden/mf2/bottom:1; +export __LMOD_REF_COUNT_MODULEPATH; +MODULEPATH=ProjectDIR/rt/hidden/mf2/top:ProjectDIR/rt/hidden/mf2/bottom; +export MODULEPATH; +unset _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/hidden/mf2/top","ProjectDIR/rt/hidden/mf2/bottom",},systemBaseMPATH="ProjectDIR/rt/hidden/mf2/top:ProjectDIR/rt/hidden/mf2/bottom",}'; +export _ModuleTable_; +=========================== +step 7 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load B +=========================== +B=9.8.7; +export B; +LOADEDMODULES=B/9.8.7; +export LOADEDMODULES; +MODULEPATH=ProjectDIR/rt/hidden/mf2/top:ProjectDIR/rt/hidden/mf2/bottom; +export MODULEPATH; +_LMFILES_=ProjectDIR/rt/hidden/mf2/bottom/B/9.8.7.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={B={fn="ProjectDIR/rt/hidden/mf2/bottom/B/9.8.7.lua",fullName="B/9.8.7",loadOrder=1,propT={},stackDepth=0,status="active",userName="B",wV="000000009.000000008.000000007.*zfinal",},},mpathA={"ProjectDIR/rt/hidden/mf2/top","ProjectDIR/rt/hidden/mf2/bottom",},systemBaseMPATH="ProjectDIR/rt/hidden/mf2/top:ProjectDIR/rt/hidden/mf2/bottom",}'; +export _ModuleTable_; +=========================== +step 8 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing list +=========================== +MODULEPATH=ProjectDIR/rt/hidden/mf2/top:ProjectDIR/rt/hidden/mf2/bottom; +export MODULEPATH; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={B={fn="ProjectDIR/rt/hidden/mf2/bottom/B/9.8.7.lua",fullName="B/9.8.7",loadOrder=1,propT={},stackDepth=0,status="active",userName="B",wV="000000009.000000008.000000007.*zfinal",},},mpathA={"ProjectDIR/rt/hidden/mf2/top","ProjectDIR/rt/hidden/mf2/bottom",},systemBaseMPATH="ProjectDIR/rt/hidden/mf2/top:ProjectDIR/rt/hidden/mf2/bottom",}'; +export _ModuleTable_; diff --git a/src/MName.lua b/src/MName.lua index 64bf1ea36..36bad69ac 100644 --- a/src/MName.lua +++ b/src/MName.lua @@ -455,7 +455,7 @@ function M.find_exact_match(self, fileA) end end - ---dbg.print{"found: ",found,", fn: ",fn,", version: ", version,"\n"} + --dbg.print{"found: ",found,", fn: ",fn,", version: ", version,"\n"} --dbg.fini("MName:find_exact_match") return found, fn, version, wV end @@ -491,9 +491,8 @@ end local function l_find_highest_by_key(self, key, fileA) - --dbg.start{"MName:find_by_key(key:\"",key,"\",fileA)"} + --dbg.start{"MName: l_find_highest_by_key(key:\"",key,"\",fileA)"} local mrc = MRC:singleton() - local a = fileA[1] or {} local weight = " " -- this is less than the lower possible weight. local idx = nil local fn = false @@ -501,18 +500,25 @@ local function l_find_highest_by_key(self, key, fileA) local version = false local pV = false local wV = false - - for j = 1,#a do - local entry = a[j] - local v = entry[key] - if (mrc:isVisible{fullName=entry.fullName,sn=entry.sn,fn=entry.fn} or isMarked(v)) then - if (v > weight) then - idx = j - weight = v - pV = entry.pV - wV = entry.wV + fileA = fileA or {} + local a + + for i = 1,#fileA do + a = fileA[i] + + for j = 1,#a do + local entry = a[j] + local v = entry[key] + if (mrc:isVisible{fullName=entry.fullName,sn=entry.sn,fn=entry.fn} or isMarked(v)) then + if (v > weight) then + idx = j + weight = v + pV = entry.pV + wV = entry.wV + end end end + if (idx) then break end end if (idx) then fn = a[idx].fn @@ -521,7 +527,7 @@ local function l_find_highest_by_key(self, key, fileA) self.__range = { pV, pV } end --dbg.print{"found: ",found,", fn: ",fn,", version: ", version,", wV: ",wV,"\n"} - --dbg.fini("MName:find_by_key") + --dbg.fini("MName: l_find_highest_by_key") return found, fn, version, wV end @@ -589,12 +595,12 @@ function M.find_inherit_match(self,fileA) end local function l_rangeCk(self, version, result_if_found, result_if_not_found) - dbg.start{"l_rangeCk(self, version: ",version,", result_if_found: ",result_if_found,", result_if_not_found: ",result_if_not_found,")"} + --dbg.start{"l_rangeCk(self, version: ",version,", result_if_found: ",result_if_found,", result_if_not_found: ",result_if_not_found,")"} local have_range = false local result = result_if_not_found if (not self.__have_range) then - dbg.print{"no range\n"} - dbg.fini("l_rangeCk") + --dbg.print{"no range\n"} + --dbg.fini("l_rangeCk") return have_range, result end @@ -604,17 +610,17 @@ local function l_rangeCk(self, version, result_if_found, result_if_not_found) local lowerFn = self.__range_fnA[1] local upperFn = self.__range_fnA[2] local pV = parseVersion(version) - dbg.print{"lowerBound: ",lowerBound,"\n"} - dbg.print{"upperBound: ",upperBound,"\n"} - dbg.print{"pV: ",pV,"\n"} - dbg.print{"lowerFn: ",lowerFn.name,", lowerFn.func(lowerBound, pV): ",lowerFn.func(lowerBound, pV),"\n"} - dbg.print{"upperFn: ",upperFn.name,", upperFn.func(pV, upperBound): ",upperFn.func(pV, upperBound),"\n"} + --dbg.print{"lowerBound: ",lowerBound,"\n"} + --dbg.print{"upperBound: ",upperBound,"\n"} + --dbg.print{"pV: ",pV,"\n"} + --dbg.print{"lowerFn: ",lowerFn.name,", lowerFn.func(lowerBound, pV): ",lowerFn.func(lowerBound, pV),"\n"} + --dbg.print{"upperFn: ",upperFn.name,", upperFn.func(pV, upperBound): ",upperFn.func(pV, upperBound),"\n"} if (lowerFn.func(lowerBound, pV) and upperFn.func(pV, upperBound)) then result = result_if_found end - dbg.fini("l_rangeCk") + --dbg.fini("l_rangeCk") return have_range, result end From 479565555fbf6d97a3c230db46ea4c2863008412 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Mon, 15 Jul 2024 19:27:57 -0500 Subject: [PATCH 015/198] Issue #713: Changing MName.src: l_find_highest_by_key() to loop over all fileA entries. Now stoping at first one found rather than just looking at fileA[1]. --- src/ModuleA.lua | 73 +++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/src/ModuleA.lua b/src/ModuleA.lua index 5de2abaa5..9440655f8 100644 --- a/src/ModuleA.lua +++ b/src/ModuleA.lua @@ -138,13 +138,13 @@ local function l_GroupIntoModules(self, level, maxdepth, mpath, dirT, T) end local function l_build(self, maxdepthT, dirA) - --dbg.start{"ModuleA l_build()"} + dbg.start{"ModuleA l_build()"} local moduleA = {} local sz = #dirA --dbg.print{"#dirA: ",sz,"\n"} for i = 1,sz do local mpath = dirA[i].mpath - --dbg.print{"mpath: ",mpath,"\n"} + dbg.print{"mpath: ",mpath,"\n"} local dirT = dirA[i].dirT local T = {} local maxdepth = maxdepthT[mpath] or -1 @@ -152,7 +152,7 @@ local function l_build(self, maxdepthT, dirA) l_GroupIntoModules(self, level, maxdepth, mpath, dirT, T) moduleA[#moduleA + 1] = {mpath = mpath, T = T} end - --dbg.fini("ModuleA l_build") + dbg.fini("ModuleA l_build") return moduleA end @@ -186,8 +186,8 @@ local function l_find_vA(name, moduleA) if (idx) then versionStr = name:sub(idx+1,-1) end - --dbg.print{"sn: ",sn,", versionStr: ",versionStr,"\n"} - --dbg.printT("vA",vA) + dbg.print{"sn: ",sn,", versionStr: ",versionStr,"\n"} + dbg.printT("l_find_vA: vA",vA) return sn, versionStr, vA end @@ -228,19 +228,20 @@ local function l_find_vB(sn, versionStr, vA) vB[#vB + 1] = v end end - --dbg.printT("vB",vB) + dbg.printT("l_find_vB: vB",vB) return fullStr, vB end local function l_search(name, moduleA) - --dbg.start{"ModuleA l_search(",name,",moduleA)"} + dbg.start{"ModuleA l_search(\"",name,"\", moduleA)"} -- First find sn and collect all v's into vA local sn, versionStr, vA = l_find_vA(name, moduleA) if (sn == nil) then return nil end + dbg.print{"sn: ",sn,", versionStr: ",versionStr,"\n"} local fullStr, vB = l_find_vB(sn, versionStr, vA) - --dbg.print{"name: ",name,", sn: ",sn,", versionStr: ",versionStr, " fullStr: ",fullStr,"\n"} + dbg.print{"name: ",name,", sn: ",sn,", versionStr: ",versionStr, " fullStr: ",fullStr,"\n"} local extended_default = cosmic:value("LMOD_EXTENDED_DEFAULT") @@ -249,12 +250,13 @@ local function l_search(name, moduleA) fileA[i] = {} collectFileA(sn, fullStr, extended_default, vB[i], fileA[i]) end - --dbg.fini("ModuleA l_search") + dbg.printT("fileA",fileA) + dbg.fini("ModuleA l_search") return sn, versionStr, fileA end function M.applyWeights(self,fullNameDfltT) - --dbg.start{"ModuleA:applyWeights(fullNameDfltT)"} + dbg.start{"ModuleA:applyWeights(fullNameDfltT)"} for fullName, weight in pairs(fullNameDfltT) do repeat local sn, versionStr, vA = l_find_vA(fullName, self.__moduleA) @@ -280,12 +282,12 @@ function M.applyWeights(self,fullNameDfltT) end until true end - --dbg.fini("ModuleA:applyWeights") + dbg.fini("ModuleA:applyWeights") end function M.__find_all_defaults(self) - --dbg.start{"ModuleA:__find_all_defaults()"} + dbg.start{"ModuleA:__find_all_defaults()"} local moduleA = self.__moduleA local defaultT = self.__defaultT local show_hidden = optionTbl().show_hidden @@ -358,7 +360,7 @@ function M.__find_all_defaults(self) t[v.fn] = { sn = k, count = v.count, fullName = v.fullName, weight = v.weight } end self.__defaultT = t - --dbg.fini("ModuleA:__find_all_defaults") + dbg.fini("ModuleA:__find_all_defaults") end @@ -406,7 +408,7 @@ function M.build_availA(self) end sort(availA[i].A, cmp) end - --dbg.fini("ModuleA:build_availA") + dbg.fini("ModuleA:build_availA") return availA end @@ -483,15 +485,20 @@ function M.inherited_search(self, search_fullName, orig_fn) end function M.search(self, name) + dbg.start{"ModuleA:search(\"",name,"\")"} if (self.__isNVV) then - return l_search(name, self.__moduleA) + local sn, versionStr, fileA = l_search(name, self.__moduleA) + dbg.fini("ModuleA:search") + return sn, versionStr, fileA end if (not self.__locationT) then self.__locationT = LocationT:new(self.__moduleA) end - return self.__locationT:search(name) + local sn, versionStr, fileA = self.__locationT:search(name) + dbg.fini("ModuleA:search") + return sn, versionStr, fileA end local function l_checkforNV(T) @@ -504,7 +511,7 @@ local function l_checkforNV(T) end local function l_build_from_spiderT(spiderT) - --dbg.start{"ModuleA l_build_from_spiderT(spiderT)"} + dbg.start{"ModuleA l_build_from_spiderT(spiderT)"} local find_first = cosmic:value("LMOD_TMOD_FIND_FIRST") local frameStk = FrameStk:singleton() local mt = frameStk:mt() @@ -514,7 +521,7 @@ local function l_build_from_spiderT(spiderT) for i = 1, #mpathA do local mpath = mpathA[i] if (isDir(mpath)) then - --dbg.print{"pulling mpath: ",mpath," into moduleA\n"} + dbg.print{"pulling mpath: ",mpath," into moduleA\n"} local T = spiderT[mpath] if (T and next(T) ~= nil) then moduleA[#moduleA+1] = { mpath = mpath, T = deepcopy(T) } @@ -524,7 +531,7 @@ local function l_build_from_spiderT(spiderT) end end end - --dbg.fini("ModuleA l_build_from_spiderT") + dbg.fini("ModuleA l_build_from_spiderT") return moduleA, not isNV end @@ -535,7 +542,7 @@ end function M.update(self, t) t = t or {} - --dbg.start{"ModuleA:update(spider_cache = ",t.spider_cache,")"} + dbg.start{"ModuleA:update(spider_cache = ",t.spider_cache,")"} local frameStk = FrameStk:singleton() local mt = frameStk:mt() local varT = frameStk:varT() @@ -593,12 +600,12 @@ function M.update(self, t) self.__locationT = false self.__moduleA = moduleA mt:updateMPathA(mpathA) - --dbg.fini("ModuleA:update") + dbg.fini("ModuleA:update") end function M.__new(self, mpathA, maxdepthT, moduleRCT, spiderT) - --dbg.start{"ModuleA:__new()"} + dbg.start{"ModuleA:__new()"} local o = {} local find_first = cosmic:value("LMOD_TMOD_FIND_FIRST") setmetatable(o,self) @@ -609,25 +616,21 @@ function M.__new(self, mpathA, maxdepthT, moduleRCT, spiderT) spiderT = spiderT or {} if (next(spiderT) ~= nil) then o.__spiderBuilt = true - --dbg.print{"calling l_build_from_spiderT()\n"} - --dbg.printT("spiderT",spiderT) + dbg.print{"calling l_build_from_spiderT()\n"} + dbg.printT("spiderT",spiderT) o.__moduleA, o.__isNVV = l_build_from_spiderT(spiderT) else - --dbg.print{"calling DirTree:new()\n"} + dbg.print{"calling DirTree:new()\n"} dirTree = DirTree:new(mpathA) o.__spiderBuilt = false o.__moduleA = l_build(o, maxdepthT, dirTree:dirA()) end - --if (moduleRCT and next(moduleRCT) ~= nil) then - -- local mrc = MRC:singleton(moduleRCT) - -- o:applyWeights(mrc:fullNameDfltT()) - --end o.__locationT = false o.__defaultT = {} - --dbg.fini("ModuleA:__new") + dbg.fini("ModuleA:__new") return o end @@ -666,10 +669,10 @@ function M.defaultT(self) end function M.singleton(self, t) - --dbg.start{"ModuleA:singleton(t)"} + dbg.start{"ModuleA:singleton(t)"} t = t or {} if (t.reset or (s_moduleA and s_moduleA:spiderBuilt())) then - --dbg.print{"Wiping out old value of s_moduleA\n"} + dbg.print{"Wiping out old value of s_moduleA\n"} self:__clear{testing=t.reset} end if (not s_moduleA) then @@ -685,14 +688,14 @@ function M.singleton(self, t) s_moduleA = self:__new(mt:modulePathA(), mt:maxDepthT(), getModuleRCT(), spiderT) end - --dbg.fini("ModuleA:singleton") + dbg.fini("ModuleA:singleton") return s_moduleA end function M.__clear(self, t) - --dbg.start{"ModuleA:__clear()"} + dbg.start{"ModuleA:__clear()"} t = t or {} local MT = require("MT") s_moduleA = false @@ -702,7 +705,7 @@ function M.__clear(self, t) Cache:__clear() end MT:__clearMT{testing=true} - --dbg.fini("ModuleA:__clear") + dbg.fini("ModuleA:__clear") end return M From af3648bd08283b8cd9c88885592e094fe03d964e Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Mon, 15 Jul 2024 21:21:38 -0500 Subject: [PATCH 016/198] Issue #713: Making sure that LMOD_TMOD_FIND_FIRST works when there are two As in different $MODULEPATH --- rt/hidden/err.txt | 6 +++++- rt/hidden/hidden.tdesc | 3 ++- rt/hidden/out.txt | 16 +++++++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/rt/hidden/err.txt b/rt/hidden/err.txt index 5c6958b20..15701e47a 100644 --- a/rt/hidden/err.txt +++ b/rt/hidden/err.txt @@ -61,7 +61,11 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing load B =========================== =========================== step 8 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load A +=========================== +=========================== +step 9 lua ProjectDIR/src/lmod.in.lua shell --regression_testing list =========================== Currently Loaded Modules: - 1) B/9.8.7 + 1) B/9.8.7 2) A/1.0 diff --git a/rt/hidden/hidden.tdesc b/rt/hidden/hidden.tdesc index 5268c83d4..b7451bb96 100644 --- a/rt/hidden/hidden.tdesc +++ b/rt/hidden/hidden.tdesc @@ -35,7 +35,8 @@ testdescript = { export LMOD_TMOD_FIND_FIRST=1 runLmod --show_hidden av # 6 runLmod load B # 7 - runLmod list # 8 + runLmod load A # 8 + runLmod list # 9 HOME=$ORIG_HOME cat _stdout.[0-9][0-9][0-9] > _stdout.orig diff --git a/rt/hidden/out.txt b/rt/hidden/out.txt index 5f3e0f6c1..484c69dfe 100644 --- a/rt/hidden/out.txt +++ b/rt/hidden/out.txt @@ -68,9 +68,23 @@ _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={B={fn="Project export _ModuleTable_; =========================== step 8 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load A +=========================== +A=1.0; +export A; +LOADEDMODULES=B/9.8.7:A/1.0; +export LOADEDMODULES; +MODULEPATH=ProjectDIR/rt/hidden/mf2/top:ProjectDIR/rt/hidden/mf2/bottom; +export MODULEPATH; +_LMFILES_=ProjectDIR/rt/hidden/mf2/bottom/B/9.8.7.lua:ProjectDIR/rt/hidden/mf2/top/A/1.0.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={A={fn="ProjectDIR/rt/hidden/mf2/top/A/1.0.lua",fullName="A/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="A",wV="000000001.*zfinal",},B={fn="ProjectDIR/rt/hidden/mf2/bottom/B/9.8.7.lua",fullName="B/9.8.7",loadOrder=1,propT={},stackDepth=0,status="active",userName="B",wV="000000009.000000008.000000007.*zfinal",},},mpathA={"ProjectDIR/rt/hidden/mf2/top","ProjectDIR/rt/hidden/mf2/bottom",},systemBaseMPATH="ProjectDIR/rt/hidden/mf2/top:ProjectDIR/rt/hidden/mf2/bottom",}'; +export _ModuleTable_; +=========================== +step 9 lua ProjectDIR/src/lmod.in.lua shell --regression_testing list =========================== MODULEPATH=ProjectDIR/rt/hidden/mf2/top:ProjectDIR/rt/hidden/mf2/bottom; export MODULEPATH; -_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={B={fn="ProjectDIR/rt/hidden/mf2/bottom/B/9.8.7.lua",fullName="B/9.8.7",loadOrder=1,propT={},stackDepth=0,status="active",userName="B",wV="000000009.000000008.000000007.*zfinal",},},mpathA={"ProjectDIR/rt/hidden/mf2/top","ProjectDIR/rt/hidden/mf2/bottom",},systemBaseMPATH="ProjectDIR/rt/hidden/mf2/top:ProjectDIR/rt/hidden/mf2/bottom",}'; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={A={fn="ProjectDIR/rt/hidden/mf2/top/A/1.0.lua",fullName="A/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="A",wV="000000001.*zfinal",},B={fn="ProjectDIR/rt/hidden/mf2/bottom/B/9.8.7.lua",fullName="B/9.8.7",loadOrder=1,propT={},stackDepth=0,status="active",userName="B",wV="000000009.000000008.000000007.*zfinal",},},mpathA={"ProjectDIR/rt/hidden/mf2/top","ProjectDIR/rt/hidden/mf2/bottom",},systemBaseMPATH="ProjectDIR/rt/hidden/mf2/top:ProjectDIR/rt/hidden/mf2/bottom",}'; export _ModuleTable_; From 4063ec2c3fb78cfa95d6f062302b7edb37b5e207 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Tue, 16 Jul 2024 10:00:16 -0500 Subject: [PATCH 017/198] Issue #713: Change to use blockA loop structure that matches the other MName fileA search member functions --- src/MName.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/MName.lua b/src/MName.lua index 36bad69ac..b2c334ae0 100644 --- a/src/MName.lua +++ b/src/MName.lua @@ -501,17 +501,17 @@ local function l_find_highest_by_key(self, key, fileA) local pV = false local wV = false fileA = fileA or {} - local a + local blockA - for i = 1,#fileA do - a = fileA[i] + for j = 1,#fileA do + blockA = fileA[j] - for j = 1,#a do - local entry = a[j] + for i = 1,#blockA do + local entry = blockA[i] local v = entry[key] if (mrc:isVisible{fullName=entry.fullName,sn=entry.sn,fn=entry.fn} or isMarked(v)) then if (v > weight) then - idx = j + idx = i weight = v pV = entry.pV wV = entry.wV @@ -521,8 +521,8 @@ local function l_find_highest_by_key(self, key, fileA) if (idx) then break end end if (idx) then - fn = a[idx].fn - version = a[idx].version or false + fn = blockA[idx].fn + version = blockA[idx].version or false found = true self.__range = { pV, pV } end From 54b67f5cf19a5cb391e07243f2804a870e1ee940 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 18 Jul 2024 10:59:36 -0500 Subject: [PATCH 018/198] Issue #714: add "=encoding UTF-8" to pod generation --- tools/Optiks.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/Optiks.lua b/tools/Optiks.lua index c876af747..c5f3396d6 100644 --- a/tools/Optiks.lua +++ b/tools/Optiks.lua @@ -378,6 +378,7 @@ end function M.buildManPod(self) local b = {} + b[#b+1] = "=encoding UTF-8" b[#b+1] = self.progName b[#b+1] = "=head1 SYNOPSIS" b[#b+1] = self.usage From 1140ef14faf0cb683257e3a2a2337691874eed14 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 18 Jul 2024 11:11:16 -0500 Subject: [PATCH 019/198] Issue #714: updating README.new --- README.new | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.new b/README.new index 428aa3068..866a001eb 100644 --- a/README.new +++ b/README.new @@ -157,3 +157,6 @@ Lmod 8.7+ (8.7.42) * Fix setting of $FPATH when running bash or ksh shell and executing zsh -l. (8.7.43) * Support for ksh flag not needed anymore (8.7.44) * Issue #710: path2pathA() keep double delims, Reduce triple delims to double +W.I.P.: + (8.7.45) * Issue #714: Adding "=encoding UTF-8" to pod generation + From 2b32ab814276cb1b7e73f0196a654999dab318d6 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 18 Jul 2024 11:24:46 -0500 Subject: [PATCH 020/198] Issue #714: update gold files for help test --- rt/help/err.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/rt/help/err.txt b/rt/help/err.txt index d79b573a6..8fa13f3af 100644 --- a/rt/help/err.txt +++ b/rt/help/err.txt @@ -2,7 +2,7 @@ step 1 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version =========================== -Modules based on Lua: Version 8.7.40 2024-06-11 15:18 -06:00 +Modules based on Lua: Version 8.7.44 2024-07-11 16:39 -06:00 by Robert McLay mclay@tacc.utexas.edu =========================== step 2 @@ -109,7 +109,7 @@ Lmod Web Sites SourceForge: https://lmod.sf.net TACC Homepage: https://www.tacc.utexas.edu/research-development/tacc-projects/lmod To report a bug please read https://lmod.readthedocs.io/en/latest/075_bug_reporting.html -Modules based on Lua: Version 8.7.40 2024-06-11 15:18 -06:00 +Modules based on Lua: Version 8.7.44 2024-07-11 16:39 -06:00 by Robert McLay mclay@tacc.utexas.edu =========================== step 3 @@ -216,7 +216,7 @@ Lmod Web Sites SourceForge: https://lmod.sf.net TACC Homepage: https://www.tacc.utexas.edu/research-development/tacc-projects/lmod To report a bug please read https://lmod.readthedocs.io/en/latest/075_bug_reporting.html -Modules based on Lua: Version 8.7.40 2024-06-11 15:18 -06:00 +Modules based on Lua: Version 8.7.44 2024-07-11 16:39 -06:00 by Robert McLay mclay@tacc.utexas.edu =========================== step 4 @@ -236,7 +236,7 @@ Version 9 step 5 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --config =========================== -Modules based on Lua: Version 8.7.40 2024-06-11 15:18 -06:00 +Modules based on Lua: Version 8.7.44 2024-07-11 16:39 -06:00 by Robert McLay mclay@tacc.utexas.edu Description Value Allow root to use Lmod (LMOD_ALLOW_ROOT_USE) yes @@ -417,7 +417,7 @@ propT = { step 6 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --miniConfig =========================== -Modules based on Lua: Version 8.7.40 2024-06-11 15:18 -06:00 +Modules based on Lua: Version 8.7.44 2024-07-11 16:39 -06:00 by Robert McLay mclay@tacc.utexas.edu LMOD_PACKAGE_PATH D nil LMOD_SYSTEM_DEFAULT_MODULES D __unknown__ @@ -426,6 +426,7 @@ LMOD_USING_FAST_TCL_INTERP Other yes no step 7 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --pod =========================== +=encoding UTF-8 module =head1 SYNOPSIS module [options] sub-command [args ...] From 2319628c3a03ed798c878efdff206a2c4dbd27ff Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 18 Jul 2024 15:04:19 -0500 Subject: [PATCH 021/198] updating README.md for 8.7.45 --- README.new | 1 - 1 file changed, 1 deletion(-) diff --git a/README.new b/README.new index 7b505aa35..7eaa0a43c 100644 --- a/README.new +++ b/README.new @@ -157,7 +157,6 @@ Lmod 8.7+ (8.7.42) * Fix setting of $FPATH when running bash or ksh shell and executing zsh -l. (8.7.43) * Support for ksh flag not needed anymore (8.7.44) * Issue #710: path2pathA() keep double delims, Reduce triple delims to double -W.I.P.: (8.7.45) * Issue #713: Changing MName.src: l_find_highest_by_key() to loop over all fileA entries. Now stoping at first one found rather than just looking at fileA[1]. * Issue #714: Adding "=encoding UTF-8" to pod generation From 98308681f7f8ef37e3c90ebd6a8646bce0c3ecbb Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 18 Jul 2024 15:04:36 -0500 Subject: [PATCH 022/198] moving to TAG_VERSION 8.7.45 --- .versionDate | 2 +- docs/source/conf.py | 3 ++- settarg/Version.lua | 6 +++--- src/Version.lua | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.versionDate b/.versionDate index c547e16b8..ff0addfe8 100644 --- a/.versionDate +++ b/.versionDate @@ -1 +1 @@ -2024-07-11 16:39 -06:00 +2024-07-18 15:04 -05:00 diff --git a/docs/source/conf.py b/docs/source/conf.py index 35a86501a..57ff16176 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -57,7 +57,7 @@ # The short X.Y version. version = '8.7' # The full version, including alpha/beta/rc tags. -release = '8.7.44' +release = '8.7.45' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -398,5 +398,6 @@ + diff --git a/settarg/Version.lua b/settarg/Version.lua index 9fe6d4acc..56b41d7e8 100644 --- a/settarg/Version.lua +++ b/settarg/Version.lua @@ -9,14 +9,14 @@ function M.branchStr() end return s == "" and s or "[branch: "..s.."]" end -function M.tag() return "8.7.44" end +function M.tag() return "8.7.45" end function M.git() - local s = "8.7.44" + local s = "8.7.45" if (s == "@" .. "git@") then s = "" end if (s == M.tag() ) then s = "" end return s == "" and s or "("..s..")" end -function M.date() return "2024-07-11 16:39 -06:00" end +function M.date() return "2024-07-18 15:04 -05:00" end function M.name() local a = {} a[#a+1] = M.tag() diff --git a/src/Version.lua b/src/Version.lua index 9fe6d4acc..56b41d7e8 100644 --- a/src/Version.lua +++ b/src/Version.lua @@ -9,14 +9,14 @@ function M.branchStr() end return s == "" and s or "[branch: "..s.."]" end -function M.tag() return "8.7.44" end +function M.tag() return "8.7.45" end function M.git() - local s = "8.7.44" + local s = "8.7.45" if (s == "@" .. "git@") then s = "" end if (s == M.tag() ) then s = "" end return s == "" and s or "("..s..")" end -function M.date() return "2024-07-11 16:39 -06:00" end +function M.date() return "2024-07-18 15:04 -05:00" end function M.name() local a = {} a[#a+1] = M.tag() From 8443a6effa3d4959596df8a3d3b47a31800dd40e Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Fri, 19 Jul 2024 10:09:24 -0500 Subject: [PATCH 023/198] Issue #715: update docs for when to use load_hook and load_spider() hook --- docs/source/170_hooks.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/source/170_hooks.rst b/docs/source/170_hooks.rst index bcf1f0139..69fdf99c9 100644 --- a/docs/source/170_hooks.rst +++ b/docs/source/170_hooks.rst @@ -95,7 +95,9 @@ used in the Lmod program. **load** (...): - This function is called after a modulefile is loaded in "load" mode. + This function is called after a modulefile is loaded in "load" + mode. Use **load_spider()** hook instead when desiring a hook during + spider evaluation. **unload** (...): This function is called after a modulefile is unloaded in "unload" mode. From a2cbf0db9f6e5e298b3ed3a96411a5c16dc4e81e Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Sun, 21 Jul 2024 18:57:38 -0400 Subject: [PATCH 024/198] Issue #716: Make sure that the zsh path vairables have values before adding KSH_SUPPORT to zsh --- init/bash.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/init/bash.in b/init/bash.in index 9e3f6c0f8..72d1953b4 100644 --- a/init/bash.in +++ b/init/bash.in @@ -29,8 +29,10 @@ if [ -n "${ZSH_VERSION+x}" -a -z "${__LMOD_SET_ZSH_FPATH+x}" ]; then zv=${ZSH_VERSION} orig_zsh_version=@orig_zsh_version@ zsh_fpath=@zsh_fpath@ - zsh_fpath=$(echo $zsh_fpath | sed -e "s|/$orig_zsh_version/|/$zv/|g" ) - export FPATH=$(@PKGV@/libexec/addto --append FPATH $zsh_fpath @PKGV@/init/ksh_funcs) + if -[ -n "${orig_zsh_version+x}" -a -n "${zsh_fpath+x}" ]; then + zsh_fpath=$(echo $zsh_fpath | sed -e "s|/$orig_zsh_version/|/$zv/|g" ) + export FPATH=$(@PKGV@/libexec/addto --append FPATH $zsh_fpath @PKGV@/init/ksh_funcs) + fi unset zv unset orig_zsh_version unset zsh_fpath From bdcccd77c3c315f99f301b53afab7e2e00beff35 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Sun, 21 Jul 2024 18:58:45 -0400 Subject: [PATCH 025/198] Fix typo --- init/bash.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/bash.in b/init/bash.in index 72d1953b4..61a396fdb 100644 --- a/init/bash.in +++ b/init/bash.in @@ -29,7 +29,7 @@ if [ -n "${ZSH_VERSION+x}" -a -z "${__LMOD_SET_ZSH_FPATH+x}" ]; then zv=${ZSH_VERSION} orig_zsh_version=@orig_zsh_version@ zsh_fpath=@zsh_fpath@ - if -[ -n "${orig_zsh_version+x}" -a -n "${zsh_fpath+x}" ]; then + if [ -n "${orig_zsh_version+x}" -a -n "${zsh_fpath+x}" ]; then zsh_fpath=$(echo $zsh_fpath | sed -e "s|/$orig_zsh_version/|/$zv/|g" ) export FPATH=$(@PKGV@/libexec/addto --append FPATH $zsh_fpath @PKGV@/init/ksh_funcs) fi From ab0b8a9ebed47853aa6eacb08cc33e9f5a5c8356 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Sun, 21 Jul 2024 19:21:37 -0400 Subject: [PATCH 026/198] Update README.new about Issue #716 --- README.new | 1 + 1 file changed, 1 insertion(+) diff --git a/README.new b/README.new index 7eaa0a43c..a5b8b59fa 100644 --- a/README.new +++ b/README.new @@ -160,3 +160,4 @@ Lmod 8.7+ (8.7.45) * Issue #713: Changing MName.src: l_find_highest_by_key() to loop over all fileA entries. Now stoping at first one found rather than just looking at fileA[1]. * Issue #714: Adding "=encoding UTF-8" to pod generation + (8.7.46) * Issue #716: Must only add KSH_SUPPORT to zsh when both $orig_zsh_version and $zsh_fpath have non-null values From 037f17ce23b4180704df123dcc9a9f8de82b3525 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Sun, 21 Jul 2024 19:29:36 -0400 Subject: [PATCH 027/198] moving to TAG_VERSION 8.7.46 --- .versionDate | 2 +- docs/source/conf.py | 3 ++- settarg/Version.lua | 6 +++--- src/Version.lua | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.versionDate b/.versionDate index ff0addfe8..9767a30a3 100644 --- a/.versionDate +++ b/.versionDate @@ -1 +1 @@ -2024-07-18 15:04 -05:00 +2024-07-21 19:29 -04:00 diff --git a/docs/source/conf.py b/docs/source/conf.py index 57ff16176..277190d73 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -57,7 +57,7 @@ # The short X.Y version. version = '8.7' # The full version, including alpha/beta/rc tags. -release = '8.7.45' +release = '8.7.46' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -399,5 +399,6 @@ + diff --git a/settarg/Version.lua b/settarg/Version.lua index 56b41d7e8..810788a43 100644 --- a/settarg/Version.lua +++ b/settarg/Version.lua @@ -9,14 +9,14 @@ function M.branchStr() end return s == "" and s or "[branch: "..s.."]" end -function M.tag() return "8.7.45" end +function M.tag() return "8.7.46" end function M.git() - local s = "8.7.45" + local s = "8.7.46" if (s == "@" .. "git@") then s = "" end if (s == M.tag() ) then s = "" end return s == "" and s or "("..s..")" end -function M.date() return "2024-07-18 15:04 -05:00" end +function M.date() return "2024-07-21 19:29 -04:00" end function M.name() local a = {} a[#a+1] = M.tag() diff --git a/src/Version.lua b/src/Version.lua index 56b41d7e8..810788a43 100644 --- a/src/Version.lua +++ b/src/Version.lua @@ -9,14 +9,14 @@ function M.branchStr() end return s == "" and s or "[branch: "..s.."]" end -function M.tag() return "8.7.45" end +function M.tag() return "8.7.46" end function M.git() - local s = "8.7.45" + local s = "8.7.46" if (s == "@" .. "git@") then s = "" end if (s == M.tag() ) then s = "" end return s == "" and s or "("..s..")" end -function M.date() return "2024-07-18 15:04 -05:00" end +function M.date() return "2024-07-21 19:29 -04:00" end function M.name() local a = {} a[#a+1] = M.tag() From a904cb50e02ce255ab7b814b6f12f639378f99c0 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Mon, 22 Jul 2024 09:54:28 -0400 Subject: [PATCH 028/198] Issue #716: use correct shell var foo --- init/bash.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/bash.in b/init/bash.in index 61a396fdb..4c31b9357 100644 --- a/init/bash.in +++ b/init/bash.in @@ -29,7 +29,7 @@ if [ -n "${ZSH_VERSION+x}" -a -z "${__LMOD_SET_ZSH_FPATH+x}" ]; then zv=${ZSH_VERSION} orig_zsh_version=@orig_zsh_version@ zsh_fpath=@zsh_fpath@ - if [ -n "${orig_zsh_version+x}" -a -n "${zsh_fpath+x}" ]; then + if [ -n "${orig_zsh_version:-}" -a -n "${zsh_fpath:-}" ]; then zsh_fpath=$(echo $zsh_fpath | sed -e "s|/$orig_zsh_version/|/$zv/|g" ) export FPATH=$(@PKGV@/libexec/addto --append FPATH $zsh_fpath @PKGV@/init/ksh_funcs) fi From a678dab5bc390c78308415805d56a87c81041dd6 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Mon, 22 Jul 2024 10:04:29 -0400 Subject: [PATCH 029/198] Issue #716: use correct shell var foo --- README.new | 1 + 1 file changed, 1 insertion(+) diff --git a/README.new b/README.new index a5b8b59fa..4fe830285 100644 --- a/README.new +++ b/README.new @@ -161,3 +161,4 @@ Lmod 8.7+ Now stoping at first one found rather than just looking at fileA[1]. * Issue #714: Adding "=encoding UTF-8" to pod generation (8.7.46) * Issue #716: Must only add KSH_SUPPORT to zsh when both $orig_zsh_version and $zsh_fpath have non-null values + (8.7.47) * Issue #716: Use correct shell foo From c8204f4c51b17920ae6eded91374fa97a24681db Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Mon, 22 Jul 2024 10:04:47 -0400 Subject: [PATCH 030/198] moving to TAG_VERSION 8.7.47 --- .versionDate | 2 +- docs/source/conf.py | 3 ++- settarg/Version.lua | 6 +++--- src/Version.lua | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.versionDate b/.versionDate index 9767a30a3..9098eab4a 100644 --- a/.versionDate +++ b/.versionDate @@ -1 +1 @@ -2024-07-21 19:29 -04:00 +2024-07-22 10:04 -04:00 diff --git a/docs/source/conf.py b/docs/source/conf.py index 277190d73..ceb06f944 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -57,7 +57,7 @@ # The short X.Y version. version = '8.7' # The full version, including alpha/beta/rc tags. -release = '8.7.46' +release = '8.7.47' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -400,5 +400,6 @@ + diff --git a/settarg/Version.lua b/settarg/Version.lua index 810788a43..2bdfcc5e7 100644 --- a/settarg/Version.lua +++ b/settarg/Version.lua @@ -9,14 +9,14 @@ function M.branchStr() end return s == "" and s or "[branch: "..s.."]" end -function M.tag() return "8.7.46" end +function M.tag() return "8.7.47" end function M.git() - local s = "8.7.46" + local s = "8.7.47" if (s == "@" .. "git@") then s = "" end if (s == M.tag() ) then s = "" end return s == "" and s or "("..s..")" end -function M.date() return "2024-07-21 19:29 -04:00" end +function M.date() return "2024-07-22 10:04 -04:00" end function M.name() local a = {} a[#a+1] = M.tag() diff --git a/src/Version.lua b/src/Version.lua index 810788a43..2bdfcc5e7 100644 --- a/src/Version.lua +++ b/src/Version.lua @@ -9,14 +9,14 @@ function M.branchStr() end return s == "" and s or "[branch: "..s.."]" end -function M.tag() return "8.7.46" end +function M.tag() return "8.7.47" end function M.git() - local s = "8.7.46" + local s = "8.7.47" if (s == "@" .. "git@") then s = "" end if (s == M.tag() ) then s = "" end return s == "" and s or "("..s..")" end -function M.date() return "2024-07-21 19:29 -04:00" end +function M.date() return "2024-07-22 10:04 -04:00" end function M.name() local a = {} a[#a+1] = M.tag() From 0a5bb6f886b67cf4f034873c1ec68b04a1a319c8 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Mon, 29 Jul 2024 18:09:00 -0500 Subject: [PATCH 031/198] Issue #717: Save the previous varT when restoring modules. Otherwise the purged env. vars are not cleared --- rt/restore_reset/err.txt | 41 +++++ rt/restore_reset/mf/Core/gcc/13.2.0.lua | 43 +++++ rt/restore_reset/mf/Core/git/2.40.1.lua | 32 ++++ rt/restore_reset/out.txt | 228 ++++++++++++++++++++++++ rt/restore_reset/restore_reset.tdesc | 60 +++++++ src/FrameStk.lua | 7 +- src/MT.lua | 4 +- 7 files changed, 411 insertions(+), 4 deletions(-) create mode 100644 rt/restore_reset/err.txt create mode 100644 rt/restore_reset/mf/Core/gcc/13.2.0.lua create mode 100644 rt/restore_reset/mf/Core/git/2.40.1.lua create mode 100644 rt/restore_reset/out.txt create mode 100644 rt/restore_reset/restore_reset.tdesc diff --git a/rt/restore_reset/err.txt b/rt/restore_reset/err.txt new file mode 100644 index 000000000..6f33d932e --- /dev/null +++ b/rt/restore_reset/err.txt @@ -0,0 +1,41 @@ +=========================== +step 1 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version +=========================== +Modules based on Lua: Version 8.7.47 2024-07-22 10:04 -04:00 + by Robert McLay mclay@tacc.utexas.edu +=========================== +step 2 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load git +=========================== +=========================== +step 3 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing save +=========================== +Saved current collection of modules to: "default" +=========================== +step 4 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing purge +=========================== +=========================== +step 5 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load gcc +=========================== +=========================== +step 6 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing restore +=========================== +Restoring modules from user's default +=========================== +step 7 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing purge +=========================== +=========================== +step 8 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load gcc +=========================== +=========================== +step 9 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing reset +=========================== +Running "module reset". Resetting modules to system default. The following $MODULEPATH directories have been removed: None diff --git a/rt/restore_reset/mf/Core/gcc/13.2.0.lua b/rt/restore_reset/mf/Core/gcc/13.2.0.lua new file mode 100644 index 000000000..21dc4050c --- /dev/null +++ b/rt/restore_reset/mf/Core/gcc/13.2.0.lua @@ -0,0 +1,43 @@ +--[[ lmod for gcc 13.2.0 + +Installed as: + +wget https://ftp.gnu.org/gnu/gcc/gcc-13.2.0/gcc-13.2.0.tar.xz +tar -xf gcc-13.2.0.tar.xz + +cd gcc-13.2.0 +./contrib/download_prerequisites + +mkdir build-gcc-13.2.0 && cd build-gcc-13.2.0 +../configure --prefix=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0 \ + --enable-languages=c,c++,fortran --disable-multilib |& tee configure.log + +make -j 6 |& tee make.log +make install |& tee makeinstall.log + +--]] + +family("Compiler") + +local compilername = "gcc" +local version = "13.2.0" +local versioned_compiler = compilername .. "-" .. version +local siteamdir = "/ford1/share/gmao_SIteam" +local installdir = pathJoin(siteamdir,compilername,versioned_compiler) + +-- Setup Modulepath for packages built by this compiler +local mroot = "/ford1/share/gmao_SIteam/lmodulefiles" +local mdir = pathJoin(mroot,"Compiler/gcc-13.2.0") +prepend_path("MODULEPATH", mdir) + +prepend_path("PATH",pathJoin(installdir,"bin")) +prepend_path("LD_LIBRARY_PATH",pathJoin(installdir,"lib64")) +prepend_path("LIBRARY_PATH",pathJoin(installdir,"lib64")) +prepend_path("INCLUDE",pathJoin(installdir,"include")) +prepend_path("INCLUDE",pathJoin(installdir,"include/c++",version)) +prepend_path("MANPATH",pathJoin(installdir,"share/man")) + +setenv("CC",pathJoin(installdir,"bin","gcc")) +setenv("CXX",pathJoin(installdir,"bin","g++")) +setenv("FC",pathJoin(installdir,"bin","gfortran")) +setenv("F90",pathJoin(installdir,"bin","gfortran")) diff --git a/rt/restore_reset/mf/Core/git/2.40.1.lua b/rt/restore_reset/mf/Core/git/2.40.1.lua new file mode 100644 index 000000000..fb7be3f41 --- /dev/null +++ b/rt/restore_reset/mf/Core/git/2.40.1.lua @@ -0,0 +1,32 @@ +--[[ File for git + + Built as: + + ./configure --prefix=/ford1/share/gmao_SIteam/git/git-2.40.1 |& tee configure.log + + Then: + make -j4 all |& tee make.log + make install |& tee makeinstall.log + + To get the man pages, download the: + + git-manpages-2.40.1.tar.xz + + tarball from: + + https://mirrors.edge.kernel.org/pub/software/scm/git/ + + and then do: + + mkdir -p /ford1/share/gmao_SIteam/git/git-2.40.1/share/man + tar xf git-manpages-2.40.1.tar.xz -C /ford1/share/gmao_SIteam/git/git-2.40.1/share/man/ + +--]] + +local version = "git-2.40.1" +local installdir = "/ford1/share/gmao_SIteam/git" + +local pkgdir = pathJoin(installdir,version) + +prepend_path("PATH",pathJoin(pkgdir,"bin")) +prepend_path("MANPATH",pathJoin(pkgdir,"share/man")) diff --git a/rt/restore_reset/out.txt b/rt/restore_reset/out.txt new file mode 100644 index 000000000..0bbdc4da6 --- /dev/null +++ b/rt/restore_reset/out.txt @@ -0,0 +1,228 @@ +=========================== +step 1 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version +=========================== +=========================== +step 2 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load git +=========================== +LOADEDMODULES=git/2.40.1; +export LOADEDMODULES; +__LMOD_REF_COUNT_MANPATH=/ford1/share/gmao_SIteam/git/git-2.40.1/share/man:1; +export __LMOD_REF_COUNT_MANPATH; +MANPATH=/ford1/share/gmao_SIteam/git/git-2.40.1/share/man; +export MANPATH; +__LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/restore_reset/mf/Core:1; +export __LMOD_REF_COUNT_MODULEPATH; +MODULEPATH=ProjectDIR/rt/restore_reset/mf/Core; +export MODULEPATH; +__LMOD_REF_COUNT_PATH=/ford1/share/gmao_SIteam/git/git-2.40.1/bin:1\;ProjectDIR/proj_mgmt:1\;PATH_to_TM:1; +export __LMOD_REF_COUNT_PATH; +PATH=/ford1/share/gmao_SIteam/git/git-2.40.1/bin:ProjectDIR/proj_mgmt:PATH_to_TM; +export PATH; +_LMFILES_=ProjectDIR/rt/restore_reset/mf/Core/git/2.40.1.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={git={fn="ProjectDIR/rt/restore_reset/mf/Core/git/2.40.1.lua",fullName="git/2.40.1",loadOrder=1,propT={},stackDepth=0,status="active",userName="git",wV="000000002.000000040.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/restore_reset/mf/Core",},systemBaseMPATH="ProjectDIR/rt/restore_reset/mf/Core",}'; +export _ModuleTable_; +=========================== +step 3 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing save +=========================== +MODULEPATH=ProjectDIR/rt/restore_reset/mf/Core; +export MODULEPATH; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={git={fn="ProjectDIR/rt/restore_reset/mf/Core/git/2.40.1.lua",fullName="git/2.40.1",loadOrder=1,propT={},stackDepth=0,status="active",userName="git",wV="000000002.000000040.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/restore_reset/mf/Core",},systemBaseMPATH="ProjectDIR/rt/restore_reset/mf/Core",}'; +export _ModuleTable_; +=========================== +step 4 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing purge +=========================== +unset LOADEDMODULES; +unset __LMOD_REF_COUNT_MANPATH; +unset MANPATH; +MODULEPATH=ProjectDIR/rt/restore_reset/mf/Core; +export MODULEPATH; +__LMOD_REF_COUNT_PATH=ProjectDIR/proj_mgmt:1\;PATH_to_TM:1; +export __LMOD_REF_COUNT_PATH; +PATH=ProjectDIR/proj_mgmt:PATH_to_TM; +export PATH; +unset _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/restore_reset/mf/Core",},systemBaseMPATH="ProjectDIR/rt/restore_reset/mf/Core",}'; +export _ModuleTable_; +=========================== +step 5 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load gcc +=========================== +CC=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/bin/gcc; +export CC; +CXX=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/bin/g++; +export CXX; +F90=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/bin/gfortran; +export F90; +FC=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/bin/gfortran; +export FC; +__LMOD_REF_COUNT_INCLUDE=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/include/c++/13.2.0:1\;/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/include:1; +export __LMOD_REF_COUNT_INCLUDE; +INCLUDE=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/include/c++/13.2.0:/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/include; +export INCLUDE; +__LMOD_REF_COUNT_LD_LIBRARY_PATH=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/lib64:1; +export __LMOD_REF_COUNT_LD_LIBRARY_PATH; +LD_LIBRARY_PATH=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/lib64; +export LD_LIBRARY_PATH; +__LMOD_REF_COUNT_LIBRARY_PATH=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/lib64:1; +export __LMOD_REF_COUNT_LIBRARY_PATH; +LIBRARY_PATH=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/lib64; +export LIBRARY_PATH; +LMOD_FAMILY_COMPILER=gcc; +export LMOD_FAMILY_COMPILER; +LMOD_FAMILY_COMPILER_VERSION=13.2.0; +export LMOD_FAMILY_COMPILER_VERSION; +LOADEDMODULES=gcc/13.2.0; +export LOADEDMODULES; +__LMOD_REF_COUNT_MANPATH=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/share/man:1; +export __LMOD_REF_COUNT_MANPATH; +MANPATH=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/share/man; +export MANPATH; +__LMOD_REF_COUNT_MODULEPATH=/ford1/share/gmao_SIteam/lmodulefiles/Compiler/gcc-13.2.0:1\;ProjectDIR/rt/restore_reset/mf/Core:1; +export __LMOD_REF_COUNT_MODULEPATH; +MODULEPATH=/ford1/share/gmao_SIteam/lmodulefiles/Compiler/gcc-13.2.0:ProjectDIR/rt/restore_reset/mf/Core; +export MODULEPATH; +__LMOD_REF_COUNT_PATH=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/bin:1\;ProjectDIR/proj_mgmt:1\;PATH_to_TM:1; +export __LMOD_REF_COUNT_PATH; +PATH=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/bin:ProjectDIR/proj_mgmt:PATH_to_TM; +export PATH; +_LMFILES_=ProjectDIR/rt/restore_reset/mf/Core/gcc/13.2.0.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={Compiler="gcc",},mT={gcc={actionA={"prepend_path(\"MODULEPATH\",\"/ford1/share/gmao_SIteam/lmodulefiles/Compiler/gcc-13.2.0\")",},fn="ProjectDIR/rt/restore_reset/mf/Core/gcc/13.2.0.lua",fullName="gcc/13.2.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="gcc",wV="000000013.000000002.*zfinal",},},mpathA={"/ford1/share/gmao_SIteam/lmodulefiles/Compiler/gcc-13.2.0","ProjectDIR/rt/restore_reset/mf/Core",},systemBaseMPATH="ProjectDIR/rt/restore_reset/mf/Core",}'; +export _ModuleTable_; +=========================== +step 6 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing restore +=========================== +unset CC; +unset CXX; +unset F90; +unset FC; +unset __LMOD_REF_COUNT_INCLUDE; +unset INCLUDE; +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH; +unset LD_LIBRARY_PATH; +unset __LMOD_REF_COUNT_LIBRARY_PATH; +unset LIBRARY_PATH; +unset LMOD_FAMILY_COMPILER; +unset LMOD_FAMILY_COMPILER_VERSION; +LOADEDMODULES=git/2.40.1; +export LOADEDMODULES; +__LMOD_REF_COUNT_MANPATH=/ford1/share/gmao_SIteam/git/git-2.40.1/share/man:1; +export __LMOD_REF_COUNT_MANPATH; +MANPATH=/ford1/share/gmao_SIteam/git/git-2.40.1/share/man; +export MANPATH; +__LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/restore_reset/mf/Core:1; +export __LMOD_REF_COUNT_MODULEPATH; +MODULEPATH=ProjectDIR/rt/restore_reset/mf/Core; +export MODULEPATH; +__LMOD_REF_COUNT_PATH=/ford1/share/gmao_SIteam/git/git-2.40.1/bin:1\;ProjectDIR/proj_mgmt:1\;PATH_to_TM:1; +export __LMOD_REF_COUNT_PATH; +PATH=/ford1/share/gmao_SIteam/git/git-2.40.1/bin:ProjectDIR/proj_mgmt:PATH_to_TM; +export PATH; +_LMFILES_=ProjectDIR/rt/restore_reset/mf/Core/git/2.40.1.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={git={fn="ProjectDIR/rt/restore_reset/mf/Core/git/2.40.1.lua",fullName="git/2.40.1",loadOrder=1,propT={},stackDepth=0,status="active",userName="git",wV="000000002.000000040.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/restore_reset/mf/Core",},systemBaseMPATH="ProjectDIR/rt/restore_reset/mf/Core",}'; +export _ModuleTable_; +__LMOD_DEFAULT_MODULES_LOADED__=1; +export __LMOD_DEFAULT_MODULES_LOADED__; +=========================== +step 7 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing purge +=========================== +unset LOADEDMODULES; +unset __LMOD_REF_COUNT_MANPATH; +unset MANPATH; +MODULEPATH=ProjectDIR/rt/restore_reset/mf/Core; +export MODULEPATH; +__LMOD_REF_COUNT_PATH=ProjectDIR/proj_mgmt:1\;PATH_to_TM:1; +export __LMOD_REF_COUNT_PATH; +PATH=ProjectDIR/proj_mgmt:PATH_to_TM; +export PATH; +unset _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/restore_reset/mf/Core",},systemBaseMPATH="ProjectDIR/rt/restore_reset/mf/Core",}'; +export _ModuleTable_; +=========================== +step 8 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load gcc +=========================== +CC=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/bin/gcc; +export CC; +CXX=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/bin/g++; +export CXX; +F90=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/bin/gfortran; +export F90; +FC=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/bin/gfortran; +export FC; +__LMOD_REF_COUNT_INCLUDE=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/include/c++/13.2.0:1\;/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/include:1; +export __LMOD_REF_COUNT_INCLUDE; +INCLUDE=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/include/c++/13.2.0:/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/include; +export INCLUDE; +__LMOD_REF_COUNT_LD_LIBRARY_PATH=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/lib64:1; +export __LMOD_REF_COUNT_LD_LIBRARY_PATH; +LD_LIBRARY_PATH=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/lib64; +export LD_LIBRARY_PATH; +__LMOD_REF_COUNT_LIBRARY_PATH=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/lib64:1; +export __LMOD_REF_COUNT_LIBRARY_PATH; +LIBRARY_PATH=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/lib64; +export LIBRARY_PATH; +LMOD_FAMILY_COMPILER=gcc; +export LMOD_FAMILY_COMPILER; +LMOD_FAMILY_COMPILER_VERSION=13.2.0; +export LMOD_FAMILY_COMPILER_VERSION; +LOADEDMODULES=gcc/13.2.0; +export LOADEDMODULES; +__LMOD_REF_COUNT_MANPATH=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/share/man:1; +export __LMOD_REF_COUNT_MANPATH; +MANPATH=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/share/man; +export MANPATH; +__LMOD_REF_COUNT_MODULEPATH=/ford1/share/gmao_SIteam/lmodulefiles/Compiler/gcc-13.2.0:1\;ProjectDIR/rt/restore_reset/mf/Core:1; +export __LMOD_REF_COUNT_MODULEPATH; +MODULEPATH=/ford1/share/gmao_SIteam/lmodulefiles/Compiler/gcc-13.2.0:ProjectDIR/rt/restore_reset/mf/Core; +export MODULEPATH; +__LMOD_REF_COUNT_PATH=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/bin:1\;ProjectDIR/proj_mgmt:1\;PATH_to_TM:1; +export __LMOD_REF_COUNT_PATH; +PATH=/ford1/share/gmao_SIteam/gcc/gcc-13.2.0/bin:ProjectDIR/proj_mgmt:PATH_to_TM; +export PATH; +_LMFILES_=ProjectDIR/rt/restore_reset/mf/Core/gcc/13.2.0.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={Compiler="gcc",},mT={gcc={actionA={"prepend_path(\"MODULEPATH\",\"/ford1/share/gmao_SIteam/lmodulefiles/Compiler/gcc-13.2.0\")",},fn="ProjectDIR/rt/restore_reset/mf/Core/gcc/13.2.0.lua",fullName="gcc/13.2.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="gcc",wV="000000013.000000002.*zfinal",},},mpathA={"/ford1/share/gmao_SIteam/lmodulefiles/Compiler/gcc-13.2.0","ProjectDIR/rt/restore_reset/mf/Core",},systemBaseMPATH="ProjectDIR/rt/restore_reset/mf/Core",}'; +export _ModuleTable_; +=========================== +step 9 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing reset +=========================== +unset CC; +unset CXX; +unset F90; +unset FC; +unset __LMOD_REF_COUNT_INCLUDE; +unset INCLUDE; +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH; +unset LD_LIBRARY_PATH; +unset __LMOD_REF_COUNT_LIBRARY_PATH; +unset LIBRARY_PATH; +unset LMOD_FAMILY_COMPILER; +unset LMOD_FAMILY_COMPILER_VERSION; +LOADEDMODULES=git/2.40.1; +export LOADEDMODULES; +__LMOD_REF_COUNT_MANPATH=/ford1/share/gmao_SIteam/git/git-2.40.1/share/man:1; +export __LMOD_REF_COUNT_MANPATH; +MANPATH=/ford1/share/gmao_SIteam/git/git-2.40.1/share/man; +export MANPATH; +__LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/restore_reset/mf/Core:1; +export __LMOD_REF_COUNT_MODULEPATH; +MODULEPATH=ProjectDIR/rt/restore_reset/mf/Core; +export MODULEPATH; +__LMOD_REF_COUNT_PATH=/ford1/share/gmao_SIteam/git/git-2.40.1/bin:1\;ProjectDIR/proj_mgmt:1\;PATH_to_TM:1; +export __LMOD_REF_COUNT_PATH; +PATH=/ford1/share/gmao_SIteam/git/git-2.40.1/bin:ProjectDIR/proj_mgmt:PATH_to_TM; +export PATH; +_LMFILES_=ProjectDIR/rt/restore_reset/mf/Core/git/2.40.1.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={git={fn="ProjectDIR/rt/restore_reset/mf/Core/git/2.40.1.lua",fullName="git/2.40.1",loadOrder=1,propT={},stackDepth=0,status="active",userName="git",wV="000000002.000000040.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/restore_reset/mf/Core",},systemBaseMPATH="ProjectDIR/rt/restore_reset/mf/Core",}'; +export _ModuleTable_; diff --git a/rt/restore_reset/restore_reset.tdesc b/rt/restore_reset/restore_reset.tdesc new file mode 100644 index 000000000..dc65df196 --- /dev/null +++ b/rt/restore_reset/restore_reset.tdesc @@ -0,0 +1,60 @@ +-- -*- lua -*- +local testName = "restore_reset" + +testdescript = { + owner = "rtm", + product = "modules", + description = [[ + "restore_reset" + ]], + keywords = {testName }, + + active = true, + testName = testName, + job_submit_method = "INTERACTIVE", + + runScript = [[ + + . $(projectDir)/rt/common_funcs.sh + + unsetMT + initStdEnvVars + export MODULEPATH=$(testDir)/mf/Core + + remove_generated_lmod_files + + runLmod --version # 1 + runLmod load git # 2 + runLmod save # 3 + runLmod purge # 4 + runLmod load gcc # 5 + runLmod restore # 6 + runLmod purge # 7 + export LMOD_SYSTEM_DEFAULT_MODULES=git + runLmod load gcc # 8 + runLmod reset # 9 + + HOME=$ORIG_HOME + cat _stdout.[0-9][0-9][0-9] > _stdout.orig + joinBase64Results -bash _stdout.orig _stdout.new + cleanUp _stdout.new out.txt + + cat _stderr.[0-9][0-9][0-9] > _stderr.orig + cleanUp _stderr.orig err.txt + + rm -f results.csv + wrapperDiff --csv results.csv $(testDir)/out.txt out.txt + wrapperDiff --csv results.csv $(testDir)/err.txt err.txt + testFinish -r $(resultFn) -t $(runtimeFn) results.csv + ]], + + + blessScript = [[ + # perform what is needed + ]], + + tests = { + { id='t1'}, + }, + +} diff --git a/src/FrameStk.lua b/src/FrameStk.lua index 6dec61004..f48cb972e 100644 --- a/src/FrameStk.lua +++ b/src/FrameStk.lua @@ -46,14 +46,15 @@ local s_frameStk = false local function l_new(self, t) dbg.start{"FrameStk:l_new()"} - t = t or {} - local o = {} + t = t or {} + local varT = t.varT or {} + local o = {} setmetatable(o,self) self.__index = self o.__count = 1 o.__origMT = MT:singleton(t) o.__stack = { - {mname = false, mt = deepcopy(o.__origMT), varT = {} } + {mname = false, mt = deepcopy(o.__origMT), varT = varT} } dbg.fini("FrameStk:l_new") return o diff --git a/src/MT.lua b/src/MT.lua index 8327ed618..b4ec3cdbc 100644 --- a/src/MT.lua +++ b/src/MT.lua @@ -1348,10 +1348,12 @@ function M.getMTfromFile(self,tt) s_mt = false __removeEnvMT() + + local varT = frameStk:varT() FrameStk:__clear() dbg.print{"Setting MODULEPATH to: ",savedMPATH,"\n"} posix_setenv(ModulePath, savedMPATH, true) - frameStk = FrameStk:singleton() + frameStk = FrameStk:singleton{varT = varT} mt = frameStk:mt() mt.systemBaseMPATH = savedBaseMPATH dbg.print{"savedBaseMPATH: ",savedBaseMPATH,"\n"} From 0e2627728f4625ad408835a7c5b0795d5a55f627 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Mon, 29 Jul 2024 18:12:31 -0500 Subject: [PATCH 032/198] Issue #717: update README.new --- README.new | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.new b/README.new index 4fe830285..5c1b28580 100644 --- a/README.new +++ b/README.new @@ -162,3 +162,7 @@ Lmod 8.7+ * Issue #714: Adding "=encoding UTF-8" to pod generation (8.7.46) * Issue #716: Must only add KSH_SUPPORT to zsh when both $orig_zsh_version and $zsh_fpath have non-null values (8.7.47) * Issue #716: Use correct shell foo +W.I.P: + (8.7.48) * Issue #717: Keep previous varT when restoring a collection. Otherwise the previous modules env vars. + are not purged. + From 3555884b038412fa03cbcb20d6da11fa929ff52e Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Tue, 30 Jul 2024 11:10:46 -0500 Subject: [PATCH 033/198] In configure run all tests before erroring out --- README.new | 4 ++-- configure | 55 +++++++++++++++++++++++++++++++++------------------- configure.ac | 53 +++++++++++++++++++++++++++++++------------------- 3 files changed, 70 insertions(+), 42 deletions(-) diff --git a/README.new b/README.new index 5c1b28580..071e7c64d 100644 --- a/README.new +++ b/README.new @@ -164,5 +164,5 @@ Lmod 8.7+ (8.7.47) * Issue #716: Use correct shell foo W.I.P: (8.7.48) * Issue #717: Keep previous varT when restoring a collection. Otherwise the previous modules env vars. - are not purged. - + are lost and therefore not purged. + * Change configure.ac to run all tests before erroring out diff --git a/configure b/configure index 4adc9c2ca..7b2d85049 100755 --- a/configure +++ b/configure @@ -4386,7 +4386,7 @@ then : withval=$with_lua; PATH_TO_LUA="$withval" if test ${PATH_TO_LUA:0:1} != '/' ; then echo "Path to lua must be absolute" - exit 1 + FOUND_ERROR=yes fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$with_lua" >&5 printf "%s\n" "PATH_TO_LUA=$with_lua" >&6; } @@ -4409,7 +4409,7 @@ then : withval=$with_luac; PATH_TO_LUAC="$withval" if test ${PATH_TO_LUAC:0:1} != '/' ; then echo "Path to luac must be absolute" - exit 1 + FOUND_ERROR=yes fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$with_luac" >&5 printf "%s\n" "PATH_TO_LUAC=$with_luac" >&6; } @@ -4449,6 +4449,8 @@ if test "$ALLOW_TCL_MFILES" = no ; then FAST_TCL_INTERP=no fi +FOUND_ERROR= + if test "$FAST_TCL_INTERP" = yes ; then OS=$(uname -s) if test "$OS" = Darwin ; then @@ -4565,7 +4567,9 @@ fi if test "$ac_cv_header_tcl_h" != yes ; then rm -f makefile - as_fn_error $? "Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" "$LINENO" 5 + FOUND_ERROR=yes + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" >&5 +printf "%s\n" "$as_me: Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" >&6;} fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing Tcl_CreateInterp" >&5 printf %s "checking for library containing Tcl_CreateInterp... " >&6; } @@ -4625,7 +4629,8 @@ then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" else $as_nop - rm -f makefile; as_fn_error $? "Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" "$LINENO" 5 + rm -f makefile; FOUND_ERROR=yes; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" >&5 +printf "%s\n" "$as_me: Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" >&6;} fi @@ -4667,7 +4672,7 @@ if test $MODE != "user_default" ; then echo "Please try setting mode to 755 or 750 or 700 or similar." echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi fi @@ -4723,7 +4728,7 @@ if test "$PS" = "UNKNOWN_PS" ; then echo "You must have valid ps in your path. Quitting!" echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi # Extract the first word of "readlink", so it can be a program name with args. @@ -4777,7 +4782,7 @@ if test "$READLINK" = "UNKNOWN_READLINK" ; then echo "You must have valid ps in your path. Quitting!" echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi for ac_prog in gexpr expr @@ -4836,7 +4841,7 @@ if test "$EXPR" = "UNKNOWN_EXPR" ; then echo "You must have valid expr or gexpr in your path. Quitting!" echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi for ac_prog in gbasename basename @@ -4895,7 +4900,7 @@ if test "$BASENAME" = "UNKNOWN_BASENAME" ; then echo "You must have either basename or gbasename in your path. Quitting!" echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi for ac_prog in bc @@ -4954,7 +4959,7 @@ if test "$BC" = "UNKNOWN_BC" ; then echo "You must have bc in your path. Quitting!" echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi # Extract the first word of "pod2man", so it can be a program name with args. @@ -5160,7 +5165,7 @@ elif test "$PATH_TO_HASHSUM" = "UNKNOWN_HASHSUM" ; then echo "You must have either sha1sum, shasum, md5sum or md5 in your path. Quitting!" echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi # Extract the first word of "tclsh", so it can be a program name with args. @@ -5214,7 +5219,7 @@ if test "$PATH_TO_TCLSH" = "UNKNOWN_TCLSH" -a "$ALLOW_TCL_MFILES" = yes; then echo "The tclsh program must be in your path. Quitting!" echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi for ac_prog in gtr tr do @@ -5326,14 +5331,14 @@ test -n "$PATH_TO_LS" || PATH_TO_LS="""" if ! command -v $PATH_TO_LUA &>/dev/null ; then echo 'The program "'$PATH_TO_LUA'" must be in your path' rm -f makefile - exit 1 + FOUND_ERROR=yes fi if test "${LUA_SUFFIX}" != no ; then if test "${PATH_TO_LUA:0:1}" = '/' -o "${PATH_TO_LUAC:0:1}" = '/'; then echo "Neither --with-lua= nor --with-luac= can be used with --with-luaSuffix=" rm -f makefile - exit 1 + FOUND_ERROR=yes fi PATH_TO_LUA=lua$LUA_SUFFIX PATH_TO_LUAC=luac$LUA_SUFFIX @@ -5349,14 +5354,14 @@ else if test "$mismatch" = true ; then echo "Both --with-lua= and --with-luac= must both be specified" rm -f makefile - exit 1 + FOUND_ERROR=yes fi fi if ! command -v $PATH_TO_LUA &>/dev/null ; then echo 'The program "'$PATH_TO_LUA'" must be in your path' rm -f makefile - exit 1 + FOUND_ERROR=yes fi if test ${PATH_TO_LUA:0:1} != '/' ; then @@ -5411,7 +5416,7 @@ fi if ! command -v $PATH_TO_LUAC &>/dev/null ; then echo 'The program "'$PATH_TO_LUAC'" must be in your path' rm -f makefile - exit 1 + FOUND_ERROR=yes fi if test "${PATH_TO_LUAC:0:1}" != '/' ; then @@ -5480,7 +5485,7 @@ IntLuaV=$( $PATH_TO_LUA -e "_,_,M,m=_VERSION:gsub('Lua%s+',''):find('(%d+)%.(%d if test $IntLuaV -lt 5001 -o $IntLuaV -gt 5004; then echo "Error: Lmod requires versions 5.1, 5.2, 5.3, or 5.4 You have: $LuaV" rm -f makefile - exit 1 + FOUND_ERROR=yes fi echo "... $LuaV" @@ -5521,7 +5526,7 @@ if test -n "$missingModules" ; then echo "" echo "You can not run Lmod without: $missingModules" rm -f makefile - exit 1 + FOUND_ERROR=yes else echo "... yes" fi @@ -5661,13 +5666,23 @@ if ! test "$HAVE_LUA_TERM" = yes; then echo Quitting! echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi fi ##### LUA configuration -- end +if test $FOUND_ERROR = yes; then + echo + echo One or more errors found -> Quiting! + echo + rm -f makefile + exit 1; +fi + + + # Extract the first word of "zsh", so it can be a program name with args. set dummy zsh; ac_word=$2 diff --git a/configure.ac b/configure.ac index e55bf3682..1fe845d66 100644 --- a/configure.ac +++ b/configure.ac @@ -652,7 +652,7 @@ AC_ARG_WITH(lua, PATH_TO_LUA="$withval" if test ${PATH_TO_LUA:0:1} != '/' ; then echo "Path to lua must be absolute" - exit 1 + FOUND_ERROR=yes fi AC_MSG_RESULT([PATH_TO_LUA=$with_lua]) AC_DEFINE_UNQUOTED(PATH_TO_LUA, "$with_lua")dnl @@ -668,7 +668,7 @@ AC_ARG_WITH(luac, PATH_TO_LUAC="$withval" if test ${PATH_TO_LUAC:0:1} != '/' ; then echo "Path to luac must be absolute" - exit 1 + FOUND_ERROR=yes fi AC_MSG_RESULT([PATH_TO_LUAC=$with_luac]) AC_DEFINE_UNQUOTED(PATH_TO_LUAC, "$with_luac")dnl @@ -696,6 +696,8 @@ if test "$ALLOW_TCL_MFILES" = no ; then FAST_TCL_INTERP=no fi +FOUND_ERROR= + if test "$FAST_TCL_INTERP" = yes ; then OS=$(uname -s) if test "$OS" = Darwin ; then @@ -731,10 +733,11 @@ if test "$FAST_TCL_INTERP" = yes ; then if test "$ac_cv_header_tcl_h" != yes ; then rm -f makefile - AC_MSG_ERROR([Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h]) + FOUND_ERROR=yes + AC_MSG_NOTICE([Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h]) fi AC_SEARCH_LIBS(Tcl_CreateInterp, [tcl] [tcl8.8] [tcl8.7] [tcl8.6] [tcl8.5],[], - [rm -f makefile; AC_MSG_ERROR([Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library])], [$TCL_LIBS]) + [rm -f makefile; FOUND_ERROR=yes; AC_MSG_NOTICE([Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library])], [$TCL_LIBS]) AC_SUBST(TCL_INCLUDE, "$TCL_INCLUDE") AC_SUBST(TCL_LIBS, "$TCL_LIBS") @@ -772,7 +775,7 @@ if test $MODE != "user_default" ; then echo "Please try setting mode to 755 or 750 or 700 or similar." echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi fi @@ -783,7 +786,7 @@ if test "$PS" = "UNKNOWN_PS" ; then echo "You must have valid ps in your path. Quitting!" echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi AC_PATH_PROG(READLINK,readlink, UNKNOWN_READLINK) @@ -792,7 +795,7 @@ if test "$READLINK" = "UNKNOWN_READLINK" ; then echo "You must have valid ps in your path. Quitting!" echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi AC_PATH_PROGS(EXPR,[gexpr] [expr], UNKNOWN_EXPR) @@ -801,7 +804,7 @@ if test "$EXPR" = "UNKNOWN_EXPR" ; then echo "You must have valid expr or gexpr in your path. Quitting!" echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi AC_PATH_PROGS(BASENAME, [gbasename] [basename], UNKNOWN_BASENAME) @@ -810,7 +813,7 @@ if test "$BASENAME" = "UNKNOWN_BASENAME" ; then echo "You must have either basename or gbasename in your path. Quitting!" echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi AC_PATH_PROGS(BC, [bc], UNKNOWN_BC) @@ -819,7 +822,7 @@ if test "$BC" = "UNKNOWN_BC" ; then echo "You must have bc in your path. Quitting!" echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi AC_PATH_PROG(PATH_TO_POD2MAN, pod2man, UNKNOWN_POD2MAN) @@ -835,7 +838,7 @@ elif test "$PATH_TO_HASHSUM" = "UNKNOWN_HASHSUM" ; then echo "You must have either sha1sum, shasum, md5sum or md5 in your path. Quitting!" echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi AC_PATH_PROG(PATH_TO_TCLSH, tclsh, UNKNOWN_TCLSH) @@ -844,7 +847,7 @@ if test "$PATH_TO_TCLSH" = "UNKNOWN_TCLSH" -a "$ALLOW_TCL_MFILES" = yes; then echo "The tclsh program must be in your path. Quitting!" echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi AC_PATH_PROGS(PATH_TO_TR, [gtr] [tr],"") AC_PATH_PROGS(PATH_TO_LS, [gls] [ls], "") @@ -856,14 +859,14 @@ AC_PATH_PROGS(PATH_TO_LS, [gls] [ls], "") if ! command -v $PATH_TO_LUA &>/dev/null ; then echo 'The program "'$PATH_TO_LUA'" must be in your path' rm -f makefile - exit 1 + FOUND_ERROR=yes fi if test "${LUA_SUFFIX}" != no ; then if test "${PATH_TO_LUA:0:1}" = '/' -o "${PATH_TO_LUAC:0:1}" = '/'; then echo "Neither --with-lua= nor --with-luac= can be used with --with-luaSuffix=" rm -f makefile - exit 1 + FOUND_ERROR=yes fi PATH_TO_LUA=lua$LUA_SUFFIX PATH_TO_LUAC=luac$LUA_SUFFIX @@ -879,14 +882,14 @@ else if test "$mismatch" = true ; then echo "Both --with-lua= and --with-luac= must both be specified" rm -f makefile - exit 1 + FOUND_ERROR=yes fi fi if ! command -v $PATH_TO_LUA &>/dev/null ; then echo 'The program "'$PATH_TO_LUA'" must be in your path' rm -f makefile - exit 1 + FOUND_ERROR=yes fi if test ${PATH_TO_LUA:0:1} != '/' ; then @@ -897,7 +900,7 @@ fi if ! command -v $PATH_TO_LUAC &>/dev/null ; then echo 'The program "'$PATH_TO_LUAC'" must be in your path' rm -f makefile - exit 1 + FOUND_ERROR=yes fi if test "${PATH_TO_LUAC:0:1}" != '/' ; then @@ -922,7 +925,7 @@ IntLuaV=$( $PATH_TO_LUA -e "_,_,M,m=_VERSION:gsub('Lua%s+',''):find('(%d+)%.(%d if test $IntLuaV -lt 5001 -o $IntLuaV -gt 5004; then echo "Error: Lmod requires versions 5.1, 5.2, 5.3, or 5.4 You have: $LuaV" rm -f makefile - exit 1 + FOUND_ERROR=yes fi echo "... $LuaV" @@ -963,7 +966,7 @@ if test -n "$missingModules" ; then echo "" echo "You can not run Lmod without: $missingModules" rm -f makefile - exit 1 + FOUND_ERROR=yes else echo "... yes" fi @@ -1054,13 +1057,23 @@ if ! test "$HAVE_LUA_TERM" = yes; then echo Quitting! echo rm -f makefile - exit 1 + FOUND_ERROR=yes fi fi ##### LUA configuration -- end +if test $FOUND_ERROR = yes; then + echo + echo One or more errors found -> Quiting! + echo + rm -f makefile + exit 1; +fi + + + AC_SUBST(ZSH_SITE_FUNCTIONS_DIRS) AC_PATH_PROG(ZSH, zsh) PATH_TO_ZSH=$ZSH From 2bc0322f6601dc997f48bd6716fcf6720bb450f7 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Tue, 30 Jul 2024 17:26:41 -0500 Subject: [PATCH 034/198] Issue #718: added __build_FPATH_for_zsh_ksh() to set FPATH correctly for bash -> zsh, bash-> ksh, etc --- Makefile.in | 4 - configure | 1016 +++++++++++++++++++++++++++----------------------- configure.ac | 29 -- init/bash.in | 26 +- 4 files changed, 567 insertions(+), 508 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4a6e90b14..f18c9c92e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52,9 +52,7 @@ SILENCE_SHELL_DEBUGGING := @SILENCE_SHELL_DEBUGGING@ SYS_LD_LIB_PATH := @SYS_LD_LIB_PATH@ SYS_LD_PRELOAD := @SYS_LD_PRELOAD@ CASE_INDEPENDENT_SORTING := @CASE_INDEPENDENT_SORTING@ -ORIG_ZSH_VERSION := @ORIG_ZSH_VERSION@ ZSH_SITE_FUNCTIONS_DIRS := @ZSH_SITE_FUNCTIONS_DIRS@ -ZSH_FPATH := @ZSH_FPATH@ SPIDER_CACHE_DESCRIPT_FN := @SPIDER_CACHE_DESCRIPT_FN@ ANCIENT := @ANCIENT@ ALLOW_TCL_MFILES := @ALLOW_TCL_MFILES@ @@ -315,8 +313,6 @@ __installMe: -e 's|@redirect@|$(REDIRECT)|g' \ -e 's|@basename@|$(BASENAME)|g' \ -e 's|@support_ksh@|$(SUPPORT_KSH)|g' \ - -e 's|@zsh_fpath@|$(ZSH_FPATH)|g' \ - -e 's|@orig_zsh_version@|$(ORIG_ZSH_VERSION)|g' \ -e 's|@cached_loads@|$(CACHED_LOADS)|g' \ -e 's|@avail_extensions@|$(LMOD_AVAIL_EXTENSIONS)|g' \ -e 's|@ps@|$(PS)|g' \ diff --git a/configure b/configure index 7b2d85049..132d7611f 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71. +# Generated by GNU Autoconf 2.72. # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, # Inc. # # @@ -15,7 +15,6 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -24,12 +23,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi @@ -101,7 +101,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -131,15 +131,14 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. +# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh NULLCMD=: @@ -147,12 +146,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else \$as_nop - case \`(set -o) 2>/dev/null\` in #( +else case e in #( + e) case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi " @@ -170,8 +170,9 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : -else \$as_nop - exitcode=1; echo positional parameters were not saved. +else case e in #( + e) exitcode=1; echo positional parameters were not saved. ;; +esac fi test x\$exitcode = x0 || exit 1 blah=\$(echo \$(echo blah)) @@ -184,14 +185,15 @@ test -x / || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes -else $as_nop - as_have_required=no +else case e in #( + e) as_have_required=no ;; +esac fi if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null then : -else $as_nop - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do @@ -224,12 +226,13 @@ IFS=$as_save_IFS if $as_found then : -else $as_nop - if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +else case e in #( + e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null then : CONFIG_SHELL=$SHELL as_have_required=yes -fi +fi ;; +esac fi @@ -251,7 +254,7 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. +# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -270,7 +273,8 @@ $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." fi exit 1 -fi +fi ;; +esac fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -309,14 +313,6 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -385,11 +381,12 @@ then : { eval $1+=\$2 }' -else $as_nop - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -403,21 +400,14 @@ then : { as_val=$(( $* )) }' -else $as_nop - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -491,6 +481,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' + t clear + :clear s/[$]LINENO.*/&-/ t lineno b @@ -539,7 +531,6 @@ esac as_echo='printf %s\n' as_echo_n='printf %s' - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -551,9 +542,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -578,10 +569,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated test -n "$DJDIR" || exec 7<&0 /dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -964,7 +955,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1177,7 +1168,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1193,7 +1184,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1223,8 +1214,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: '$ac_option' +Try '$0 --help' for more information" ;; *=*) @@ -1232,7 +1223,7 @@ Try \`$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: '$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1282,7 +1273,7 @@ do as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: `$host' +# There might be people who depend on the old broken behavior: '$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -1350,7 +1341,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -1378,7 +1369,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +'configure' configures this package to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1392,11 +1383,11 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages + -q, --quiet, --silent do not print 'checking ...' messages --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' + -C, --config-cache alias for '--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] + --srcdir=DIR find the sources in DIR [configure dir or '..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1404,10 +1395,10 @@ Installation directories: --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. +By default, 'make install' will install all the files in +'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify +an installation prefix other than '$ac_default_prefix' using '--prefix', +for instance '--prefix=\$HOME'. For better control, use the options below. @@ -1546,7 +1537,7 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory -Use these variables to override the choices made by `configure' or to help +Use these variables to override the choices made by 'configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to the package provider. @@ -1614,9 +1605,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.71 +generated by GNU Autoconf 2.72 -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1655,11 +1646,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1678,8 +1670,8 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> @@ -1687,10 +1679,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -1730,11 +1724,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -1770,7 +1765,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.71. Invocation command line was +generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -2016,10 +2011,10 @@ esac printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } fi done @@ -2055,9 +2050,7 @@ struct stat; /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; +static char *e (char **p, int i) { return p[i]; } @@ -2071,6 +2064,21 @@ static char *f (char * (*g) (char **, int), char **p, ...) return s; } +/* C89 style stringification. */ +#define noexpand_stringify(a) #a +const char *stringified = noexpand_stringify(arbitrary+token=sequence); + +/* C89 style token pasting. Exercises some of the corner cases that + e.g. old MSVC gets wrong, but not very hard. */ +#define noexpand_concat(a,b) a##b +#define expand_concat(a,b) noexpand_concat(a,b) +extern int vA; +extern int vbee; +#define aye A +#define bee B +int *pvA = &expand_concat(v,aye); +int *pvbee = &noexpand_concat(v,bee); + /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not \xHH hex character constants. These do not provoke an error unfortunately, instead are silently treated @@ -2098,16 +2106,19 @@ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); # Test code for whether the C compiler supports C99 (global declarations) ac_c_conftest_c99_globals=' -// Does the compiler advertise C99 conformance? +/* Does the compiler advertise C99 conformance? */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L # error "Compiler does not advertise C99 conformance" #endif +// See if C++-style comments work. + #include extern int puts (const char *); extern int printf (const char *, ...); extern int dprintf (int, const char *, ...); extern void *malloc (size_t); +extern void free (void *); // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare @@ -2157,7 +2168,6 @@ typedef const char *ccp; static inline int test_restrict (ccp restrict text) { - // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) @@ -2223,6 +2233,8 @@ ac_c_conftest_c99_main=' ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; + // Work around memory leak warnings. + free (ia); // Check named initializers. struct named_init ni = { @@ -2244,7 +2256,7 @@ ac_c_conftest_c99_main=' # Test code for whether the C compiler supports C11 (global declarations) ac_c_conftest_c11_globals=' -// Does the compiler advertise C11 conformance? +/* Does the compiler advertise C11 conformance? */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L # error "Compiler does not advertise C11 conformance" #endif @@ -2367,12 +2379,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2381,18 +2393,18 @@ printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -2408,11 +2420,11 @@ printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## @@ -2450,8 +2462,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2473,7 +2485,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2495,8 +2508,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2518,7 +2531,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2553,8 +2567,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2576,7 +2590,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2598,8 +2613,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -2638,7 +2653,8 @@ if test $ac_prog_rejected = yes; then ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2662,8 +2678,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2685,7 +2701,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2711,8 +2728,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2734,7 +2751,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2772,8 +2790,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2795,7 +2813,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2817,8 +2836,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2840,7 +2859,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2869,10 +2889,10 @@ fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2944,8 +2964,8 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. +# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -2965,7 +2985,7 @@ do ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' + # safe: cross compilers may not add the suffix if given an '-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -2976,8 +2996,9 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else $as_nop - ac_file='' +else case e in #( + e) ac_file='' ;; +esac fi if test -z "$ac_file" then : @@ -2986,13 +3007,14 @@ printf "%s\n" "no" >&6; } printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 printf %s "checking for C compiler default output file name... " >&6; } @@ -3016,10 +3038,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. + # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) +# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will +# work properly (i.e., refer to 'conftest.exe'), while it won't with +# 'rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -3029,11 +3051,12 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi rm -f conftest conftest$ac_cv_exeext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3049,6 +3072,8 @@ int main (void) { FILE *f = fopen ("conftest.out", "w"); + if (!f) + return 1; return ferror (f) || fclose (f) != 0; ; @@ -3088,26 +3113,27 @@ printf "%s\n" "$ac_try_echo"; } >&5 if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use '--host'. +See 'config.log' for more details" "$LINENO" 5; } fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +rm -f conftest.$ac_ext conftest$ac_cv_exeext \ + conftest.o conftest.obj conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } if test ${ac_cv_objext+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3139,16 +3165,18 @@ then : break;; esac done -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext +rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 printf "%s\n" "$ac_cv_objext" >&6; } @@ -3159,8 +3187,8 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } if test ${ac_cv_c_compiler_gnu+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3177,12 +3205,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes -else $as_nop - ac_compiler_gnu=no +else case e in #( + e) ac_compiler_gnu=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } @@ -3200,8 +3230,8 @@ printf %s "checking whether $CC accepts -g... " >&6; } if test ${ac_cv_prog_cc_g+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_save_c_werror_flag=$ac_c_werror_flag +else case e in #( + e) ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -3219,8 +3249,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes -else $as_nop - CFLAGS="" +else case e in #( + e) CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3235,8 +3265,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - ac_c_werror_flag=$ac_save_c_werror_flag +else case e in #( + e) ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3253,12 +3283,15 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag + ac_c_werror_flag=$ac_save_c_werror_flag ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 printf "%s\n" "$ac_cv_prog_cc_g" >&6; } @@ -3285,8 +3318,8 @@ printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c11=no +else case e in #( + e) ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3303,25 +3336,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" + CC="$CC $ac_cv_prog_cc_c11" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 + ac_prog_cc_stdc=c11 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -3331,8 +3367,8 @@ printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c99=no +else case e in #( + e) ac_cv_prog_cc_c99=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3349,25 +3385,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c99" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" + CC="$CC $ac_cv_prog_cc_c99" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 + ac_prog_cc_stdc=c99 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -3377,8 +3416,8 @@ printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c89=no +else case e in #( + e) ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3395,25 +3434,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c89" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" + CC="$CC $ac_cv_prog_cc_c89" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 + ac_prog_cc_stdc=c89 ;; +esac fi fi @@ -3473,13 +3515,14 @@ then : printf "%s\n" "DUPLICATE_PATHS=$with_duplicatePaths" >&6; } printf "%s\n" "#define DUPLICATE_PATHS \"$with_duplicatePaths\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DUPLICATE_PATHS=$withval" >&5 printf "%s\n" "DUPLICATE_PATHS=$withval" >&6; } DUPLICATE_PATHS="$withval" printf "%s\n" "#define DUPLICATE_PATHS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3494,13 +3537,14 @@ then : printf "%s\n" "LMOD_ALLOW_ROOT_USE=$with_allowRootUse" >&6; } printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$with_allowRootUse\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_ALLOW_ROOT_USE=$withval" >&5 printf "%s\n" "LMOD_ALLOW_ROOT_USE=$withval" >&6; } LMOD_ALLOW_ROOT_USE="$withval" printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3513,13 +3557,14 @@ then : printf "%s\n" "SITE_MSG_FILE=$with_siteMsgFile" >&6; } printf "%s\n" "#define SITE_MSG_FILE \"$with_siteMsgFile\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_MSG_FILE=$withval" >&5 printf "%s\n" "SITE_MSG_FILE=$withval" >&6; } SITE_MSG_FILE="$withval" printf "%s\n" "#define SITE_MSG_FILE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3532,13 +3577,14 @@ then : printf "%s\n" "LMOD_OVERRIDE_LANG=$with_lang" >&6; } printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$with_lang\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_OVERRIDE_LANG=$withval" >&5 printf "%s\n" "LMOD_OVERRIDE_LANG=$withval" >&6; } LMOD_OVERRIDE_LANG="$withval" printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3553,13 +3599,14 @@ then : printf "%s\n" "CASE_INDEPENDENT_SORTING=$with_caseIndependentSorting" >&6; } printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$with_caseIndependentSorting\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CASE_INDEPENDENT_SORTING=$withval" >&5 printf "%s\n" "CASE_INDEPENDENT_SORTING=$withval" >&6; } CASE_INDEPENDENT_SORTING="$withval" printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3574,13 +3621,14 @@ then : printf "%s\n" "COLORIZE=$with_colorize" >&6; } printf "%s\n" "#define COLORIZE \"$with_colorize\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: COLORIZE=$withval" >&5 printf "%s\n" "COLORIZE=$withval" >&6; } COLORIZE="$withval" printf "%s\n" "#define COLORIZE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3595,13 +3643,14 @@ then : printf "%s\n" "DYNAMIC_SPIDER_CACHE=$with_dynamicSpiderCache" >&6; } printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$with_dynamicSpiderCache\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DYNAMIC_SPIDER_CACHE=$withval" >&5 printf "%s\n" "DYNAMIC_SPIDER_CACHE=$withval" >&6; } DYNAMIC_SPIDER_CACHE="$withval" printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3616,13 +3665,14 @@ then : printf "%s\n" "HIDDEN_ITALIC=$with_hiddenItalic" >&6; } printf "%s\n" "#define HIDDEN_ITALIC \"$with_hiddenItalic\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HIDDEN_ITALIC=$withval" >&5 printf "%s\n" "HIDDEN_ITALIC=$withval" >&6; } HIDDEN_ITALIC="$withval" printf "%s\n" "#define HIDDEN_ITALIC \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3637,13 +3687,14 @@ then : printf "%s\n" "EXACT_MATCH=$with_exactMatch" >&6; } printf "%s\n" "#define EXACT_MATCH \"$with_exactMatch\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXACT_MATCH=$withval" >&5 printf "%s\n" "EXACT_MATCH=$withval" >&6; } EXACT_MATCH="$withval" printf "%s\n" "#define EXACT_MATCH \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3657,13 +3708,14 @@ then : printf "%s\n" "MODE=$with_mode" >&6; } printf "%s\n" "#define MODE \"$with_mode\"" >>confdefs.h -else $as_nop - withval="user_default" +else case e in #( + e) withval="user_default" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODE=$withval" >&5 printf "%s\n" "MODE=$withval" >&6; } MODE="$withval" printf "%s\n" "#define MODE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3676,13 +3728,14 @@ then : printf "%s\n" "LMOD_CONFIG_DIR=$with_lmodConfigDir" >&6; } printf "%s\n" "#define LMOD_CONFIG_DIR \"$with_lmodConfigDir\"" >>confdefs.h -else $as_nop - withval="/etc/lmod" +else case e in #( + e) withval="/etc/lmod" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_CONFIG_DIR=$withval" >&5 printf "%s\n" "LMOD_CONFIG_DIR=$withval" >&6; } LMOD_CONFIG_DIR="$withval" printf "%s\n" "#define LMOD_CONFIG_DIR \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3697,13 +3750,14 @@ then : printf "%s\n" "AUTO_SWAP=$with_autoSwap" >&6; } printf "%s\n" "#define AUTO_SWAP \"$with_autoSwap\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AUTO_SWAP=$withval" >&5 printf "%s\n" "AUTO_SWAP=$withval" >&6; } AUTO_SWAP="$withval" printf "%s\n" "#define AUTO_SWAP \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3720,13 +3774,14 @@ then : printf "%s\n" "EXPORT_MODULE=$with_exportedModuleCmd" >&6; } printf "%s\n" "#define EXPORT_MODULE \"$with_exportedModuleCmd\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXPORT_MODULE=$withval" >&5 printf "%s\n" "EXPORT_MODULE=$withval" >&6; } EXPORT_MODULE="$withval" printf "%s\n" "#define EXPORT_MODULE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3741,13 +3796,14 @@ then : printf "%s\n" "REDIRECT=$with_redirect" >&6; } printf "%s\n" "#define REDIRECT \"$with_redirect\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: REDIRECT=$withval" >&5 printf "%s\n" "REDIRECT=$withval" >&6; } REDIRECT="$withval" printf "%s\n" "#define REDIRECT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3759,13 +3815,14 @@ then : printf "%s\n" "MODULEPATH_ROOT=$with_module_root_path" >&6; } printf "%s\n" "#define MODULEPATH_ROOT \"$with_module_root_path\"" >>confdefs.h -else $as_nop - withval="$prefix/modulefiles" +else case e in #( + e) withval="$prefix/modulefiles" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_ROOT=$withval" >&5 printf "%s\n" "MODULEPATH_ROOT=$withval" >&6; } MODULEPATH_ROOT="$withval" printf "%s\n" "#define MODULEPATH_ROOT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3778,13 +3835,14 @@ then : printf "%s\n" "ANCIENT=$with_ancient" >&6; } printf "%s\n" "#define ANCIENT \"$with_ancient\"" >>confdefs.h -else $as_nop - withval="86400" +else case e in #( + e) withval="86400" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ANCIENT=$withval" >&5 printf "%s\n" "ANCIENT=$withval" >&6; } ANCIENT="$withval" printf "%s\n" "#define ANCIENT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3797,13 +3855,14 @@ then : printf "%s\n" "SHORT_TIME=$with_shortTime" >&6; } printf "%s\n" "#define SHORT_TIME \"$with_shortTime\"" >>confdefs.h -else $as_nop - withval="2" +else case e in #( + e) withval="2" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SHORT_TIME=$withval" >&5 printf "%s\n" "SHORT_TIME=$withval" >&6; } SHORT_TIME="$withval" printf "%s\n" "#define SHORT_TIME \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3816,13 +3875,14 @@ then : printf "%s\n" "SPIDER_CACHE_DIRS=$with_spiderCacheDir" >&6; } printf "%s\n" "#define SPIDER_CACHE_DIRS \"$with_spiderCacheDir\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DIRS=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DIRS=$withval" >&6; } SPIDER_CACHE_DIRS="$withval" printf "%s\n" "#define SPIDER_CACHE_DIRS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3835,13 +3895,14 @@ then : printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$with_spiderCacheDescript" >&6; } printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$with_spiderCacheDescript\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DESCRIPT_FN=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$withval" >&6; } SPIDER_CACHE_DESCRIPT_FN="$withval" printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3854,13 +3915,14 @@ then : printf "%s\n" "UPDATE_SYSTEM_FN=$with_updateSystemFn" >&6; } printf "%s\n" "#define UPDATE_SYSTEM_FN \"$with_updateSystemFn\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: UPDATE_SYSTEM_FN=$withval" >&5 printf "%s\n" "UPDATE_SYSTEM_FN=$withval" >&6; } UPDATE_SYSTEM_FN="$withval" printf "%s\n" "#define UPDATE_SYSTEM_FN \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3873,13 +3935,14 @@ then : printf "%s\n" "PREPEND_BLOCK=$with_prependBlock" >&6; } printf "%s\n" "#define PREPEND_BLOCK \"$with_prependBlock\"" >>confdefs.h -else $as_nop - withval="normal" +else case e in #( + e) withval="normal" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PREPEND_BLOCK=$withval" >&5 printf "%s\n" "PREPEND_BLOCK=$withval" >&6; } PREPEND_BLOCK="$withval" printf "%s\n" "#define PREPEND_BLOCK \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3892,13 +3955,14 @@ then : printf "%s\n" "SITE_NAME=$with_siteName" >&6; } printf "%s\n" "#define SITE_NAME \"$with_siteName\"" >>confdefs.h -else $as_nop - withval='' +else case e in #( + e) withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_NAME=$withval" >&5 printf "%s\n" "SITE_NAME=$withval" >&6; } SITE_NAME="$withval" printf "%s\n" "#define SITE_NAME \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3911,13 +3975,14 @@ then : printf "%s\n" "SYSHOST=$with_syshost" >&6; } printf "%s\n" "#define SYSHOST \"$with_syshost\"" >>confdefs.h -else $as_nop - withval='' +else case e in #( + e) withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SYSHOST=$withval" >&5 printf "%s\n" "SYSHOST=$withval" >&6; } SYSHOST="$withval" printf "%s\n" "#define SYSHOST \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3932,13 +3997,14 @@ then : printf "%s\n" "ALLOW_TCL_MFILES==$withval" >&6; } printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ALLOW_TCL_MFILES=$withval" >&5 printf "%s\n" "ALLOW_TCL_MFILES=$withval" >&6; } ALLOW_TCL_MFILES="$withval" printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3953,13 +4019,14 @@ then : printf "%s\n" "DISABLE_NAME_AUTOSWAP==$withval" >&6; } printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DISABLE_NAME_AUTOSWAP=$withval" >&5 printf "%s\n" "DISABLE_NAME_AUTOSWAP=$withval" >&6; } DISABLE_NAME_AUTOSWAP="$withval" printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3974,13 +4041,14 @@ then : printf "%s\n" "MPATH_AVAIL==$withval" >&6; } printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MPATH_AVAIL=$withval" >&5 printf "%s\n" "MPATH_AVAIL=$withval" >&6; } MPATH_AVAIL="$withval" printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3995,13 +4063,14 @@ then : printf "%s\n" "SETTARG=$with_settarg" >&6; } printf "%s\n" "#define SETTARG \"$with_settarg\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SETTARG=$withval" >&5 printf "%s\n" "SETTARG=$withval" >&6; } SETTARG="$withval" printf "%s\n" "#define SETTARG \"$withval\"" >>confdefs.h - + ;; +esac fi DFLT_IGNORE_DIRS=".svn,.git,.hg,.bzr" @@ -4016,13 +4085,14 @@ then : printf "%s\n" "IGNORE_DIRS=$with_ignoreDirs" >&6; } printf "%s\n" "#define IGNORE_DIRS \"$with_ignoreDirs\"" >>confdefs.h -else $as_nop - withval="$DFLT_IGNORE_DIRS" +else case e in #( + e) withval="$DFLT_IGNORE_DIRS" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IGNORE_DIRS=$withval" >&5 printf "%s\n" "IGNORE_DIRS=$withval" >&6; } IGNORE_DIRS="$withval" printf "%s\n" "#define IGNORE_DIRS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4037,13 +4107,14 @@ then : printf "%s\n" "PIN_VERSIONS=$with_pinVersions" >&6; } printf "%s\n" "#define PIN_VERSIONS \"$with_pinVersions\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PIN_VERSIONS=$withval" >&5 printf "%s\n" "PIN_VERSIONS=$withval" >&6; } PIN_VERSIONS="$withval" printf "%s\n" "#define PIN_VERSIONS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4058,13 +4129,14 @@ then : printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$with_downstreamConflicts" >&6; } printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$with_downstreamConflicts\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_DOWNSTREAM_CONFLICTS=$withval" >&5 printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$withval" >&6; } LMOD_DOWNSTREAM_CONFLICTS="$withval" printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4079,13 +4151,14 @@ then : printf "%s\n" "MODULES_AUTO_HANDLING=$with_modulesAutoHandling" >&6; } printf "%s\n" "#define MODULES_AUTO_HANDLING \"$with_modulesAutoHandling\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULES_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULES_AUTO_HANDLING=$withval" >&6; } MODULES_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULES_AUTO_HANDLING \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4100,13 +4173,14 @@ then : printf "%s\n" "TMOD_PATH_RULE=$with_tmodPathRule" >&6; } printf "%s\n" "#define TMOD_PATH_RULE \"$with_tmodPathRule\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_PATH_RULE=$withval" >&5 printf "%s\n" "TMOD_PATH_RULE=$withval" >&6; } TMOD_PATH_RULE="$withval" printf "%s\n" "#define TMOD_PATH_RULE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4121,13 +4195,14 @@ then : printf "%s\n" "TMOD_FIND_FIRST=$with_tmodFindFirst" >&6; } printf "%s\n" "#define TMOD_FIND_FIRST \"$with_tmodFindFirst\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_FIND_FIRST=$withval" >&5 printf "%s\n" "TMOD_FIND_FIRST=$withval" >&6; } TMOD_FIND_FIRST="$withval" printf "%s\n" "#define TMOD_FIND_FIRST \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4140,13 +4215,14 @@ then : printf "%s\n" "LUA_INCLUDE=$with_lua_include" >&6; } printf "%s\n" "#define LUA_INCLUDE \"$with_lua_include\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_INCLUDE=$withval" >&5 printf "%s\n" "LUA_INCLUDE=$withval" >&6; } LUA_INCLUDE="$withval" printf "%s\n" "#define LUA_INCLUDE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4161,13 +4237,14 @@ then : printf "%s\n" "CACHED_LOADS=$with_cachedLoads" >&6; } printf "%s\n" "#define CACHED_LOADS \"$with_cachedLoads\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CACHED_LOADS=$withval" >&5 printf "%s\n" "CACHED_LOADS=$withval" >&6; } CACHED_LOADS="$withval" printf "%s\n" "#define CACHED_LOADS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4182,13 +4259,14 @@ then : printf "%s\n" "EXTENDED_DEFAULT=$with_extendedDefault" >&6; } printf "%s\n" "#define EXTENDED_DEFAULT \"$with_extendedDefault\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXTENDED_DEFAULT=$withval" >&5 printf "%s\n" "EXTENDED_DEFAULT=$withval" >&6; } EXTENDED_DEFAULT="$withval" printf "%s\n" "#define EXTENDED_DEFAULT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4203,13 +4281,14 @@ then : printf "%s\n" "SUPPORT_KSH=$with_supportKsh" >&6; } printf "%s\n" "#define SUPPORT_KSH \"$with_supportKsh\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SUPPORT_KSH=$withval" >&5 printf "%s\n" "SUPPORT_KSH=$withval" >&6; } SUPPORT_KSH="$withval" printf "%s\n" "#define SUPPORT_KSH \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4222,13 +4301,14 @@ then : printf "%s\n" "MODULEPATH_INIT=$with_ModulePathInit" >&6; } printf "%s\n" "#define MODULEPATH_INIT \"$with_ModulePathInit\"" >>confdefs.h -else $as_nop - withval="@PKG@/init/.modulespath" +else case e in #( + e) withval="@PKG@/init/.modulespath" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_INIT=$withval" >&5 printf "%s\n" "MODULEPATH_INIT=$withval" >&6; } MODULEPATH_INIT="$withval" printf "%s\n" "#define MODULEPATH_INIT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4243,13 +4323,14 @@ then : printf "%s\n" "SITE_CONTROLLED_PREFIX=$with_siteControlPrefix" >&6; } printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$with_siteControlPrefix\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_CONTROLLED_PREFIX=$withval" >&5 printf "%s\n" "SITE_CONTROLLED_PREFIX=$withval" >&6; } SITE_CONTROLLED_PREFIX="$withval" printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4264,13 +4345,14 @@ then : printf "%s\n" "USE_BUILT_IN_PKGS=$with_useBuiltinPkgs" >&6; } printf "%s\n" "#define USE_BUILT_IN_PKGS \"$with_useBuiltinPkgs\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_BUILT_IN_PKGS=$withval" >&5 printf "%s\n" "USE_BUILT_IN_PKGS=$withval" >&6; } USE_BUILT_IN_PKGS="$withval" printf "%s\n" "#define USE_BUILT_IN_PKGS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4285,13 +4367,14 @@ then : printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$with_useDotConfigDirOnly" >&6; } printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$with_useDotConfigDirOnly\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_DOT_CONFIG_DIR_ONLY=$withval" >&5 printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$withval" >&6; } USE_DOT_CONFIG_DIR_ONLY="$withval" printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4306,13 +4389,14 @@ then : printf "%s\n" "SILENCE_SHELL_DEBUGGING=$with_silentShellDebugging" >&6; } printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$with_silentShellDebugging\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SILENCE_SHELL_DEBUGGING=$withval" >&5 printf "%s\n" "SILENCE_SHELL_DEBUGGING=$withval" >&6; } SILENCE_SHELL_DEBUGGING="$withval" printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4327,13 +4411,14 @@ then : printf "%s\n" "FAST_TCL_INTERP=$with_fastTCLInterp" >&6; } printf "%s\n" "#define FAST_TCL_INTERP \"$with_fastTCLInterp\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FAST_TCL_INTERP=$withval" >&5 printf "%s\n" "FAST_TCL_INTERP=$withval" >&6; } FAST_TCL_INTERP="$withval" printf "%s\n" "#define FAST_TCL_INTERP \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4348,13 +4433,14 @@ then : printf "%s\n" "MODULE_AUTO_HANDLING=$with-moduleAutoHandling" >&6; } printf "%s\n" "#define MODULE_AUTO_HANDLING \"$with-moduleAutoHandling\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULE_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULE_AUTO_HANDLING=$withval" >&6; } MODULE_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULE_AUTO_HANDLING \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4369,13 +4455,14 @@ then : printf "%s\n" "AVAIL_EXTENSIONS=$with_availExtensions" >&6; } printf "%s\n" "#define AVAIL_EXTENSIONS \"$with_availExtensions\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AVAIL_EXTENSIONS=$withval" >&5 printf "%s\n" "AVAIL_EXTENSIONS=$withval" >&6; } AVAIL_EXTENSIONS="$withval" printf "%s\n" "#define AVAIL_EXTENSIONS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4392,13 +4479,14 @@ then : printf "%s\n" "PATH_TO_LUA=$with_lua" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$with_lua\"" >>confdefs.h -else $as_nop - withval="lua" +else case e in #( + e) withval="lua" PATH_TO_LUA="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$withval" >&5 printf "%s\n" "PATH_TO_LUA=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4415,13 +4503,14 @@ then : printf "%s\n" "PATH_TO_LUAC=$with_luac" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$with_luac\"" >>confdefs.h -else $as_nop - withval="luac" +else case e in #( + e) withval="luac" PATH_TO_LUAC="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$withval" >&5 printf "%s\n" "PATH_TO_LUAC=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4436,13 +4525,14 @@ then : printf "%s\n" "LUA_SUFFIX=$with_luaSuffic" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$with_luaSuffix\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" LUA_SUFFIX="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_SUFFIX=$withval" >&5 printf "%s\n" "LUA_SUFFIX=$withval" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$withval\"" >>confdefs.h - + ;; +esac fi if test "$ALLOW_TCL_MFILES" = no ; then @@ -4473,8 +4563,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else $as_nop - case $pkgConfig in +else case e in #( + e) case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -4500,6 +4590,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; +esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -4576,15 +4667,21 @@ printf %s "checking for library containing Tcl_CreateInterp... " >&6; } if test ${ac_cv_search_Tcl_CreateInterp+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char Tcl_CreateInterp (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char Tcl_CreateInterp (void); int main (void) { @@ -4615,11 +4712,13 @@ done if test ${ac_cv_search_Tcl_CreateInterp+y} then : -else $as_nop - ac_cv_search_Tcl_CreateInterp=no +else case e in #( + e) ac_cv_search_Tcl_CreateInterp=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_Tcl_CreateInterp" >&5 printf "%s\n" "$ac_cv_search_Tcl_CreateInterp" >&6; } @@ -4628,9 +4727,10 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop - rm -f makefile; FOUND_ERROR=yes; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" >&5 -printf "%s\n" "$as_me: Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" >&6;} +else case e in #( + e) rm -f makefile; FOUND_ERROR=yes; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" >&5 +printf "%s\n" "$as_me: Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" >&6;} ;; +esac fi @@ -4684,8 +4784,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PS+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PS in +else case e in #( + e) case $PS in [\\/]* | ?:[\\/]*) ac_cv_path_PS="$PS" # Let the user override the test with a path. ;; @@ -4711,6 +4811,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PS" && ac_cv_path_PS="UNKNOWN_PS" ;; +esac ;; esac fi PS=$ac_cv_path_PS @@ -4738,8 +4839,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_READLINK+y} then : printf %s "(cached) " >&6 -else $as_nop - case $READLINK in +else case e in #( + e) case $READLINK in [\\/]* | ?:[\\/]*) ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path. ;; @@ -4765,6 +4866,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_READLINK" && ac_cv_path_READLINK="UNKNOWN_READLINK" ;; +esac ;; esac fi READLINK=$ac_cv_path_READLINK @@ -4794,8 +4896,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_EXPR+y} then : printf %s "(cached) " >&6 -else $as_nop - case $EXPR in +else case e in #( + e) case $EXPR in [\\/]* | ?:[\\/]*) ac_cv_path_EXPR="$EXPR" # Let the user override the test with a path. ;; @@ -4820,6 +4922,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi EXPR=$ac_cv_path_EXPR @@ -4853,8 +4956,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BASENAME+y} then : printf %s "(cached) " >&6 -else $as_nop - case $BASENAME in +else case e in #( + e) case $BASENAME in [\\/]* | ?:[\\/]*) ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path. ;; @@ -4879,6 +4982,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi BASENAME=$ac_cv_path_BASENAME @@ -4912,8 +5016,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BC+y} then : printf %s "(cached) " >&6 -else $as_nop - case $BC in +else case e in #( + e) case $BC in [\\/]* | ?:[\\/]*) ac_cv_path_BC="$BC" # Let the user override the test with a path. ;; @@ -4938,6 +5042,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi BC=$ac_cv_path_BC @@ -4969,8 +5074,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_POD2MAN+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_POD2MAN in +else case e in #( + e) case $PATH_TO_POD2MAN in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_POD2MAN="$PATH_TO_POD2MAN" # Let the user override the test with a path. ;; @@ -4996,6 +5101,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_POD2MAN" && ac_cv_path_PATH_TO_POD2MAN="UNKNOWN_POD2MAN" ;; +esac ;; esac fi PATH_TO_POD2MAN=$ac_cv_path_PATH_TO_POD2MAN @@ -5016,8 +5122,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_GIT+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_GIT in +else case e in #( + e) case $PATH_TO_GIT in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_GIT="$PATH_TO_GIT" # Let the user override the test with a path. ;; @@ -5043,6 +5149,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_GIT" && ac_cv_path_PATH_TO_GIT="""" ;; +esac ;; esac fi PATH_TO_GIT=$ac_cv_path_PATH_TO_GIT @@ -5064,8 +5171,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_PAGER+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_PAGER in +else case e in #( + e) case $PATH_TO_PAGER in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_PAGER="$PATH_TO_PAGER" # Let the user override the test with a path. ;; @@ -5090,6 +5197,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PATH_TO_PAGER=$ac_cv_path_PATH_TO_PAGER @@ -5116,8 +5224,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_HASHSUM+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_HASHSUM in +else case e in #( + e) case $PATH_TO_HASHSUM in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_HASHSUM="$PATH_TO_HASHSUM" # Let the user override the test with a path. ;; @@ -5142,6 +5250,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PATH_TO_HASHSUM=$ac_cv_path_PATH_TO_HASHSUM @@ -5175,8 +5284,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TCLSH+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_TCLSH in +else case e in #( + e) case $PATH_TO_TCLSH in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TCLSH="$PATH_TO_TCLSH" # Let the user override the test with a path. ;; @@ -5202,6 +5311,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_TCLSH" && ac_cv_path_PATH_TO_TCLSH="UNKNOWN_TCLSH" ;; +esac ;; esac fi PATH_TO_TCLSH=$ac_cv_path_PATH_TO_TCLSH @@ -5230,8 +5340,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TR+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_TR in +else case e in #( + e) case $PATH_TO_TR in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TR="$PATH_TO_TR" # Let the user override the test with a path. ;; @@ -5256,6 +5366,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PATH_TO_TR=$ac_cv_path_PATH_TO_TR @@ -5281,8 +5392,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_LS+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_LS in +else case e in #( + e) case $PATH_TO_LS in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_LS="$PATH_TO_LS" # Let the user override the test with a path. ;; @@ -5307,6 +5418,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PATH_TO_LS=$ac_cv_path_PATH_TO_LS @@ -5372,8 +5484,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUA+y} then : printf %s "(cached) " >&6 -else $as_nop - case $FIND_PATH_TO_LUA in +else case e in #( + e) case $FIND_PATH_TO_LUA in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUA="$FIND_PATH_TO_LUA" # Let the user override the test with a path. ;; @@ -5398,6 +5510,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi FIND_PATH_TO_LUA=$ac_cv_path_FIND_PATH_TO_LUA @@ -5427,8 +5540,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUAC+y} then : printf %s "(cached) " >&6 -else $as_nop - case $FIND_PATH_TO_LUAC in +else case e in #( + e) case $FIND_PATH_TO_LUAC in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUAC="$FIND_PATH_TO_LUAC" # Let the user override the test with a path. ;; @@ -5453,6 +5566,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi FIND_PATH_TO_LUAC=$ac_cv_path_FIND_PATH_TO_LUAC @@ -5599,8 +5713,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else $as_nop - case $pkgConfig in +else case e in #( + e) case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -5626,6 +5740,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; +esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -5682,8 +5797,6 @@ if test $FOUND_ERROR = yes; then fi - - # Extract the first word of "zsh", so it can be a program name with args. set dummy zsh; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -5691,8 +5804,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ZSH+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ZSH in +else case e in #( + e) case $ZSH in [\\/]* | ?:[\\/]*) ac_cv_path_ZSH="$ZSH" # Let the user override the test with a path. ;; @@ -5717,6 +5830,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ZSH=$ac_cv_path_ZSH @@ -5761,33 +5875,6 @@ EOF rm conftest.zsh fi - -if test -n "$PATH_TO_ZSH" ; then - cat > conftest.zsh << 'EOF' -echo $ZSH_VERSION -EOF - chmod +x conftest.zsh - ORIG_ZSH_VERSION=`$PATH_TO_ZSH -f ./conftest.zsh 2> /dev/null` - rm conftest.zsh -fi - - - -if test -n "$PATH_TO_ZSH" ; then - cat > conftest.zsh << 'EOF' -echo $FPATH -EOF - - chmod +x conftest.zsh - - unset FPATH - ZSH_FPATH=`$PATH_TO_ZSH -f ./conftest.zsh 2> /dev/null` - - rm conftest.zsh -fi - - - ac_config_files="$ac_config_files makefile:Makefile.in" cat >confcache <<\_ACEOF @@ -5800,8 +5887,8 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the +# 'ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* 'ac_cv_foo' will be assigned the # following values. _ACEOF @@ -5831,14 +5918,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote + # 'set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # `set' quotes correctly as required by POSIX, so do not add quotes. + # 'set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -5902,9 +5989,7 @@ s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g t quote b any :quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g +s/[][ `~#$^&*(){}\\|;'\''"<>?]/\\&/g s/\$/$$/g H :any @@ -5964,7 +6049,6 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -5973,12 +6057,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi @@ -6050,7 +6135,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -6079,7 +6164,6 @@ as_fn_error () } # as_fn_error - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -6119,11 +6203,12 @@ then : { eval $1+=\$2 }' -else $as_nop - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -6137,11 +6222,12 @@ then : { as_val=$(( $* )) }' -else $as_nop - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith @@ -6224,9 +6310,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -6307,10 +6393,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated exec 6>&1 @@ -6326,7 +6414,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.71. Invocation command line was +generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6353,7 +6441,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions +'$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -6381,10 +6469,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.71, +configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -6441,8 +6529,8 @@ do ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: '$1' +Try '$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -6492,7 +6580,7 @@ do case $ac_config_target in "makefile") CONFIG_FILES="$CONFIG_FILES makefile:Makefile.in" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; esac done @@ -6510,7 +6598,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. +# after its creation but before its name has been assigned to '$tmp'. $debug || { tmp= ac_tmp= @@ -6534,7 +6622,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. +# This happens for instance with './config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -6700,7 +6788,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6722,19 +6810,19 @@ do -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. + # because $ac_f cannot contain ':'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is `configure' which instantiates (i.e., don't + # Let's still pretend it is 'configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` @@ -6858,7 +6946,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when `$srcdir' = `.'. +# Neutralize VPATH when '$srcdir' = '.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -6887,9 +6975,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" diff --git a/configure.ac b/configure.ac index 1fe845d66..cfe0a3ed5 100644 --- a/configure.ac +++ b/configure.ac @@ -1072,8 +1072,6 @@ if test $FOUND_ERROR = yes; then exit 1; fi - - AC_SUBST(ZSH_SITE_FUNCTIONS_DIRS) AC_PATH_PROG(ZSH, zsh) PATH_TO_ZSH=$ZSH @@ -1108,33 +1106,6 @@ EOF rm conftest.zsh fi -AC_SUBST(ORIG_ZSH_VERSION) -if test -n "$PATH_TO_ZSH" ; then - cat > conftest.zsh << 'EOF' -echo $ZSH_VERSION -EOF - chmod +x conftest.zsh - ORIG_ZSH_VERSION=`$PATH_TO_ZSH -f ./conftest.zsh 2> /dev/null` - rm conftest.zsh -fi - - -AC_SUBST(ZSH_FPATH) -if test -n "$PATH_TO_ZSH" ; then - cat > conftest.zsh << 'EOF' -echo $FPATH -EOF - - chmod +x conftest.zsh - - unset FPATH - ZSH_FPATH=`$PATH_TO_ZSH -f ./conftest.zsh 2> /dev/null` - - rm conftest.zsh -fi - - - AC_CONFIG_FILES([makefile:Makefile.in]) AC_OUTPUT diff --git a/init/bash.in b/init/bash.in index 4c31b9357..2c82ea8bb 100644 --- a/init/bash.in +++ b/init/bash.in @@ -23,28 +23,32 @@ fi # Prepend the FPATH variable for ksh functions when ssh is being used, # except for zsh as it breaks things there. +__build_FPATH_for_zsh_ksh() +{ + zsh_fpath=$(zsh -f -c 'echo $FPATH') + export FPATH=$(@PKGV@/libexec/addto --append FPATH $zsh_fpath @PKGV@/init/ksh_funcs) + unset zsh_fpath +} if [ -n "${ZSH_VERSION+x}" -a -z "${__LMOD_SET_ZSH_FPATH+x}" ]; then export __LMOD_SET_ZSH_FPATH=1 - zv=${ZSH_VERSION} - orig_zsh_version=@orig_zsh_version@ - zsh_fpath=@zsh_fpath@ - if [ -n "${orig_zsh_version:-}" -a -n "${zsh_fpath:-}" ]; then - zsh_fpath=$(echo $zsh_fpath | sed -e "s|/$orig_zsh_version/|/$zv/|g" ) - export FPATH=$(@PKGV@/libexec/addto --append FPATH $zsh_fpath @PKGV@/init/ksh_funcs) - fi - unset zv - unset orig_zsh_version - unset zsh_fpath + __build_FPATH_for_zsh_ksh fi if [ -n "${KSH_VERSION+x}" -o -n "${BASH_VERSION+x}" ]; then if [ -z "${__LMOD_SET_KSH_FPATH:-}" ]; then + type zsh > /dev/null 2>&1 + if [ "$?" = 0 ]; then + __build_FPATH_for_zsh_ksh + else + export FPATH=$(@PKGV@/libexec/addto --append FPATH ${FPATH:-} @PKGV@/init/ksh_funcs) + fi export __LMOD_SET_KSH_FPATH=1 - export FPATH=$(@PKGV@/libexec/addto --append FPATH $FPATH @PKGV@/init/ksh_funcs) fi fi +unset -f __build_FPATH_for_zsh_ksh + export LMOD_ROOT=@lmod_root@ export LMOD_PKG=@PKGV@ export LMOD_DIR=$LMOD_PKG/libexec From 51b5d09818c841115550baf5d52906053a77f267 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Wed, 31 Jul 2024 14:33:32 -0500 Subject: [PATCH 035/198] Reset configure.ac back to main branch --- configure | 1063 +++++++++++++++++++++++--------------------------- configure.ac | 78 ++-- 2 files changed, 527 insertions(+), 614 deletions(-) diff --git a/configure b/configure index 132d7611f..4adc9c2ca 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72. +# Generated by GNU Autoconf 2.71. # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, # Inc. # # @@ -15,6 +15,7 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -23,13 +24,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else case e in #( - e) case `(set -o) 2>/dev/null` in #( +else $as_nop + case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi @@ -101,7 +101,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as 'sh COMMAND' +# We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -131,14 +131,15 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed 'exec'. +# out after a failed `exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh NULLCMD=: @@ -146,13 +147,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else case e in #( - e) case \`(set -o) 2>/dev/null\` in #( +else \$as_nop + case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi " @@ -170,9 +170,8 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : -else case e in #( - e) exitcode=1; echo positional parameters were not saved. ;; -esac +else \$as_nop + exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 blah=\$(echo \$(echo blah)) @@ -185,15 +184,14 @@ test -x / || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes -else case e in #( - e) as_have_required=no ;; -esac +else $as_nop + as_have_required=no fi if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null then : -else case e in #( - e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else $as_nop + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do @@ -226,13 +224,12 @@ IFS=$as_save_IFS if $as_found then : -else case e in #( - e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null then : CONFIG_SHELL=$SHELL as_have_required=yes -fi ;; -esac +fi fi @@ -254,7 +251,7 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed 'exec'. +# out after a failed `exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -273,8 +270,7 @@ $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." fi exit 1 -fi ;; -esac +fi fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -313,6 +309,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -381,12 +385,11 @@ then : { eval $1+=\$2 }' -else case e in #( - e) as_fn_append () +else $as_nop + as_fn_append () { eval $1=\$$1\$2 - } ;; -esac + } fi # as_fn_append # as_fn_arith ARG... @@ -400,14 +403,21 @@ then : { as_val=$(( $* )) }' -else case e in #( - e) as_fn_arith () +else $as_nop + as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } ;; -esac + } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -481,8 +491,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' - t clear - :clear s/[$]LINENO.*/&-/ t lineno b @@ -531,6 +539,7 @@ esac as_echo='printf %s\n' as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -542,9 +551,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. - # In both cases, we have to default to 'cp -pR'. + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -569,12 +578,10 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -as_tr_sh="eval sed '$as_sed_sh'" # deprecated +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" test -n "$DJDIR" || exec 7<&0 /dev/null && - as_fn_error $? "invalid feature name: '$ac_useropt'" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -955,7 +964,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: '$ac_useropt'" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1168,7 +1177,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: '$ac_useropt'" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1184,7 +1193,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: '$ac_useropt'" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1214,8 +1223,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: '$ac_option' -Try '$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1223,7 +1232,7 @@ Try '$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: '$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1273,7 +1282,7 @@ do as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: '$host' +# There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -1341,7 +1350,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -1369,7 +1378,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures this package to adapt to many kinds of systems. +\`configure' configures this package to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1383,11 +1392,11 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print 'checking ...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for '--cache-file=config.cache' + -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or '..'] + --srcdir=DIR find the sources in DIR [configure dir or \`..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1395,10 +1404,10 @@ Installation directories: --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, 'make install' will install all the files in -'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify -an installation prefix other than '$ac_default_prefix' using '--prefix', -for instance '--prefix=\$HOME'. +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. For better control, use the options below. @@ -1537,7 +1546,7 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory -Use these variables to override the choices made by 'configure' or to help +Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to the package provider. @@ -1605,9 +1614,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.72 +generated by GNU Autoconf 2.71 -Copyright (C) 2023 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1646,12 +1655,11 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + ac_retval=1 fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1670,8 +1678,8 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> @@ -1679,12 +1687,10 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac +else $as_nop + eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -1724,12 +1730,11 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + ac_retval=1 fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -1765,7 +1770,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.72. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2011,10 +2016,10 @@ esac printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See 'config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2050,7 +2055,9 @@ struct stat; /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (char **p, int i) +static char *e (p, i) + char **p; + int i; { return p[i]; } @@ -2064,21 +2071,6 @@ static char *f (char * (*g) (char **, int), char **p, ...) return s; } -/* C89 style stringification. */ -#define noexpand_stringify(a) #a -const char *stringified = noexpand_stringify(arbitrary+token=sequence); - -/* C89 style token pasting. Exercises some of the corner cases that - e.g. old MSVC gets wrong, but not very hard. */ -#define noexpand_concat(a,b) a##b -#define expand_concat(a,b) noexpand_concat(a,b) -extern int vA; -extern int vbee; -#define aye A -#define bee B -int *pvA = &expand_concat(v,aye); -int *pvbee = &noexpand_concat(v,bee); - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not \xHH hex character constants. These do not provoke an error unfortunately, instead are silently treated @@ -2106,19 +2098,16 @@ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); # Test code for whether the C compiler supports C99 (global declarations) ac_c_conftest_c99_globals=' -/* Does the compiler advertise C99 conformance? */ +// Does the compiler advertise C99 conformance? #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L # error "Compiler does not advertise C99 conformance" #endif -// See if C++-style comments work. - #include extern int puts (const char *); extern int printf (const char *, ...); extern int dprintf (int, const char *, ...); extern void *malloc (size_t); -extern void free (void *); // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare @@ -2168,6 +2157,7 @@ typedef const char *ccp; static inline int test_restrict (ccp restrict text) { + // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) @@ -2233,8 +2223,6 @@ ac_c_conftest_c99_main=' ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; - // Work around memory leak warnings. - free (ia); // Check named initializers. struct named_init ni = { @@ -2256,7 +2244,7 @@ ac_c_conftest_c99_main=' # Test code for whether the C compiler supports C11 (global declarations) ac_c_conftest_c11_globals=' -/* Does the compiler advertise C11 conformance? */ +// Does the compiler advertise C11 conformance? #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L # error "Compiler does not advertise C11 conformance" #endif @@ -2379,12 +2367,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2393,18 +2381,18 @@ printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -2420,11 +2408,11 @@ printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## @@ -2462,8 +2450,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2485,8 +2473,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2508,8 +2495,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2531,8 +2518,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2567,8 +2553,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2590,8 +2576,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2613,8 +2598,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -2653,8 +2638,7 @@ if test $ac_prog_rejected = yes; then ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2678,8 +2662,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2701,8 +2685,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2728,8 +2711,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2751,8 +2734,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2790,8 +2772,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2813,8 +2795,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2836,8 +2817,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2859,8 +2840,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2889,10 +2869,10 @@ fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See 'config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2964,8 +2944,8 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. -# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -2985,7 +2965,7 @@ do ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an '-o' + # safe: cross compilers may not add the suffix if given an `-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -2996,9 +2976,8 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else case e in #( - e) ac_file='' ;; -esac +else $as_nop + ac_file='' fi if test -z "$ac_file" then : @@ -3007,14 +2986,13 @@ printf "%s\n" "no" >&6; } printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See 'config.log' for more details" "$LINENO" 5; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 printf %s "checking for C compiler default output file name... " >&6; } @@ -3038,10 +3016,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) -# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will -# work properly (i.e., refer to 'conftest.exe'), while it won't with -# 'rm'. + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -3051,12 +3029,11 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else case e in #( - e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See 'config.log' for more details" "$LINENO" 5; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3072,8 +3049,6 @@ int main (void) { FILE *f = fopen ("conftest.out", "w"); - if (!f) - return 1; return ferror (f) || fclose (f) != 0; ; @@ -3113,27 +3088,26 @@ printf "%s\n" "$ac_try_echo"; } >&5 if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use '--host'. -See 'config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext \ - conftest.o conftest.obj conftest.out +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } if test ${ac_cv_objext+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3165,18 +3139,16 @@ then : break;; esac done -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See 'config.log' for more details" "$LINENO" 5; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; -esac +rm -f conftest.$ac_cv_objext conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 printf "%s\n" "$ac_cv_objext" >&6; } @@ -3187,8 +3159,8 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } if test ${ac_cv_c_compiler_gnu+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3205,14 +3177,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes -else case e in #( - e) ac_compiler_gnu=no ;; -esac +else $as_nop + ac_compiler_gnu=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } @@ -3230,8 +3200,8 @@ printf %s "checking whether $CC accepts -g... " >&6; } if test ${ac_cv_prog_cc_g+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_save_c_werror_flag=$ac_c_werror_flag +else $as_nop + ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -3249,8 +3219,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes -else case e in #( - e) CFLAGS="" +else $as_nop + CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3265,8 +3235,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else case e in #( - e) ac_c_werror_flag=$ac_save_c_werror_flag +else $as_nop + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3283,15 +3253,12 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag ;; -esac + ac_c_werror_flag=$ac_save_c_werror_flag fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 printf "%s\n" "$ac_cv_prog_cc_g" >&6; } @@ -3318,8 +3285,8 @@ printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c11=no +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3336,28 +3303,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c11" = x +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" ;; -esac + CC="$CC $ac_cv_prog_cc_c11" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 ;; -esac + ac_prog_cc_stdc=c11 fi fi if test x$ac_prog_cc_stdc = xno @@ -3367,8 +3331,8 @@ printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c99=no +else $as_nop + ac_cv_prog_cc_c99=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3385,28 +3349,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c99" = x +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" ;; -esac + CC="$CC $ac_cv_prog_cc_c99" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 ;; -esac + ac_prog_cc_stdc=c99 fi fi if test x$ac_prog_cc_stdc = xno @@ -3416,8 +3377,8 @@ printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c89=no +else $as_nop + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3434,28 +3395,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c89" = x +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" ;; -esac + CC="$CC $ac_cv_prog_cc_c89" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 ;; -esac + ac_prog_cc_stdc=c89 fi fi @@ -3515,14 +3473,13 @@ then : printf "%s\n" "DUPLICATE_PATHS=$with_duplicatePaths" >&6; } printf "%s\n" "#define DUPLICATE_PATHS \"$with_duplicatePaths\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DUPLICATE_PATHS=$withval" >&5 printf "%s\n" "DUPLICATE_PATHS=$withval" >&6; } DUPLICATE_PATHS="$withval" printf "%s\n" "#define DUPLICATE_PATHS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3537,14 +3494,13 @@ then : printf "%s\n" "LMOD_ALLOW_ROOT_USE=$with_allowRootUse" >&6; } printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$with_allowRootUse\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_ALLOW_ROOT_USE=$withval" >&5 printf "%s\n" "LMOD_ALLOW_ROOT_USE=$withval" >&6; } LMOD_ALLOW_ROOT_USE="$withval" printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3557,14 +3513,13 @@ then : printf "%s\n" "SITE_MSG_FILE=$with_siteMsgFile" >&6; } printf "%s\n" "#define SITE_MSG_FILE \"$with_siteMsgFile\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_MSG_FILE=$withval" >&5 printf "%s\n" "SITE_MSG_FILE=$withval" >&6; } SITE_MSG_FILE="$withval" printf "%s\n" "#define SITE_MSG_FILE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3577,14 +3532,13 @@ then : printf "%s\n" "LMOD_OVERRIDE_LANG=$with_lang" >&6; } printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$with_lang\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_OVERRIDE_LANG=$withval" >&5 printf "%s\n" "LMOD_OVERRIDE_LANG=$withval" >&6; } LMOD_OVERRIDE_LANG="$withval" printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3599,14 +3553,13 @@ then : printf "%s\n" "CASE_INDEPENDENT_SORTING=$with_caseIndependentSorting" >&6; } printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$with_caseIndependentSorting\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CASE_INDEPENDENT_SORTING=$withval" >&5 printf "%s\n" "CASE_INDEPENDENT_SORTING=$withval" >&6; } CASE_INDEPENDENT_SORTING="$withval" printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3621,14 +3574,13 @@ then : printf "%s\n" "COLORIZE=$with_colorize" >&6; } printf "%s\n" "#define COLORIZE \"$with_colorize\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: COLORIZE=$withval" >&5 printf "%s\n" "COLORIZE=$withval" >&6; } COLORIZE="$withval" printf "%s\n" "#define COLORIZE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3643,14 +3595,13 @@ then : printf "%s\n" "DYNAMIC_SPIDER_CACHE=$with_dynamicSpiderCache" >&6; } printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$with_dynamicSpiderCache\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DYNAMIC_SPIDER_CACHE=$withval" >&5 printf "%s\n" "DYNAMIC_SPIDER_CACHE=$withval" >&6; } DYNAMIC_SPIDER_CACHE="$withval" printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3665,14 +3616,13 @@ then : printf "%s\n" "HIDDEN_ITALIC=$with_hiddenItalic" >&6; } printf "%s\n" "#define HIDDEN_ITALIC \"$with_hiddenItalic\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HIDDEN_ITALIC=$withval" >&5 printf "%s\n" "HIDDEN_ITALIC=$withval" >&6; } HIDDEN_ITALIC="$withval" printf "%s\n" "#define HIDDEN_ITALIC \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3687,14 +3637,13 @@ then : printf "%s\n" "EXACT_MATCH=$with_exactMatch" >&6; } printf "%s\n" "#define EXACT_MATCH \"$with_exactMatch\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXACT_MATCH=$withval" >&5 printf "%s\n" "EXACT_MATCH=$withval" >&6; } EXACT_MATCH="$withval" printf "%s\n" "#define EXACT_MATCH \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3708,14 +3657,13 @@ then : printf "%s\n" "MODE=$with_mode" >&6; } printf "%s\n" "#define MODE \"$with_mode\"" >>confdefs.h -else case e in #( - e) withval="user_default" +else $as_nop + withval="user_default" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODE=$withval" >&5 printf "%s\n" "MODE=$withval" >&6; } MODE="$withval" printf "%s\n" "#define MODE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3728,14 +3676,13 @@ then : printf "%s\n" "LMOD_CONFIG_DIR=$with_lmodConfigDir" >&6; } printf "%s\n" "#define LMOD_CONFIG_DIR \"$with_lmodConfigDir\"" >>confdefs.h -else case e in #( - e) withval="/etc/lmod" +else $as_nop + withval="/etc/lmod" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_CONFIG_DIR=$withval" >&5 printf "%s\n" "LMOD_CONFIG_DIR=$withval" >&6; } LMOD_CONFIG_DIR="$withval" printf "%s\n" "#define LMOD_CONFIG_DIR \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3750,14 +3697,13 @@ then : printf "%s\n" "AUTO_SWAP=$with_autoSwap" >&6; } printf "%s\n" "#define AUTO_SWAP \"$with_autoSwap\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AUTO_SWAP=$withval" >&5 printf "%s\n" "AUTO_SWAP=$withval" >&6; } AUTO_SWAP="$withval" printf "%s\n" "#define AUTO_SWAP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3774,14 +3720,13 @@ then : printf "%s\n" "EXPORT_MODULE=$with_exportedModuleCmd" >&6; } printf "%s\n" "#define EXPORT_MODULE \"$with_exportedModuleCmd\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXPORT_MODULE=$withval" >&5 printf "%s\n" "EXPORT_MODULE=$withval" >&6; } EXPORT_MODULE="$withval" printf "%s\n" "#define EXPORT_MODULE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3796,14 +3741,13 @@ then : printf "%s\n" "REDIRECT=$with_redirect" >&6; } printf "%s\n" "#define REDIRECT \"$with_redirect\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: REDIRECT=$withval" >&5 printf "%s\n" "REDIRECT=$withval" >&6; } REDIRECT="$withval" printf "%s\n" "#define REDIRECT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3815,14 +3759,13 @@ then : printf "%s\n" "MODULEPATH_ROOT=$with_module_root_path" >&6; } printf "%s\n" "#define MODULEPATH_ROOT \"$with_module_root_path\"" >>confdefs.h -else case e in #( - e) withval="$prefix/modulefiles" +else $as_nop + withval="$prefix/modulefiles" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_ROOT=$withval" >&5 printf "%s\n" "MODULEPATH_ROOT=$withval" >&6; } MODULEPATH_ROOT="$withval" printf "%s\n" "#define MODULEPATH_ROOT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3835,14 +3778,13 @@ then : printf "%s\n" "ANCIENT=$with_ancient" >&6; } printf "%s\n" "#define ANCIENT \"$with_ancient\"" >>confdefs.h -else case e in #( - e) withval="86400" +else $as_nop + withval="86400" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ANCIENT=$withval" >&5 printf "%s\n" "ANCIENT=$withval" >&6; } ANCIENT="$withval" printf "%s\n" "#define ANCIENT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3855,14 +3797,13 @@ then : printf "%s\n" "SHORT_TIME=$with_shortTime" >&6; } printf "%s\n" "#define SHORT_TIME \"$with_shortTime\"" >>confdefs.h -else case e in #( - e) withval="2" +else $as_nop + withval="2" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SHORT_TIME=$withval" >&5 printf "%s\n" "SHORT_TIME=$withval" >&6; } SHORT_TIME="$withval" printf "%s\n" "#define SHORT_TIME \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3875,14 +3816,13 @@ then : printf "%s\n" "SPIDER_CACHE_DIRS=$with_spiderCacheDir" >&6; } printf "%s\n" "#define SPIDER_CACHE_DIRS \"$with_spiderCacheDir\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DIRS=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DIRS=$withval" >&6; } SPIDER_CACHE_DIRS="$withval" printf "%s\n" "#define SPIDER_CACHE_DIRS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3895,14 +3835,13 @@ then : printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$with_spiderCacheDescript" >&6; } printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$with_spiderCacheDescript\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DESCRIPT_FN=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$withval" >&6; } SPIDER_CACHE_DESCRIPT_FN="$withval" printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3915,14 +3854,13 @@ then : printf "%s\n" "UPDATE_SYSTEM_FN=$with_updateSystemFn" >&6; } printf "%s\n" "#define UPDATE_SYSTEM_FN \"$with_updateSystemFn\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: UPDATE_SYSTEM_FN=$withval" >&5 printf "%s\n" "UPDATE_SYSTEM_FN=$withval" >&6; } UPDATE_SYSTEM_FN="$withval" printf "%s\n" "#define UPDATE_SYSTEM_FN \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3935,14 +3873,13 @@ then : printf "%s\n" "PREPEND_BLOCK=$with_prependBlock" >&6; } printf "%s\n" "#define PREPEND_BLOCK \"$with_prependBlock\"" >>confdefs.h -else case e in #( - e) withval="normal" +else $as_nop + withval="normal" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PREPEND_BLOCK=$withval" >&5 printf "%s\n" "PREPEND_BLOCK=$withval" >&6; } PREPEND_BLOCK="$withval" printf "%s\n" "#define PREPEND_BLOCK \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3955,14 +3892,13 @@ then : printf "%s\n" "SITE_NAME=$with_siteName" >&6; } printf "%s\n" "#define SITE_NAME \"$with_siteName\"" >>confdefs.h -else case e in #( - e) withval='' +else $as_nop + withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_NAME=$withval" >&5 printf "%s\n" "SITE_NAME=$withval" >&6; } SITE_NAME="$withval" printf "%s\n" "#define SITE_NAME \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3975,14 +3911,13 @@ then : printf "%s\n" "SYSHOST=$with_syshost" >&6; } printf "%s\n" "#define SYSHOST \"$with_syshost\"" >>confdefs.h -else case e in #( - e) withval='' +else $as_nop + withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SYSHOST=$withval" >&5 printf "%s\n" "SYSHOST=$withval" >&6; } SYSHOST="$withval" printf "%s\n" "#define SYSHOST \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3997,14 +3932,13 @@ then : printf "%s\n" "ALLOW_TCL_MFILES==$withval" >&6; } printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ALLOW_TCL_MFILES=$withval" >&5 printf "%s\n" "ALLOW_TCL_MFILES=$withval" >&6; } ALLOW_TCL_MFILES="$withval" printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4019,14 +3953,13 @@ then : printf "%s\n" "DISABLE_NAME_AUTOSWAP==$withval" >&6; } printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DISABLE_NAME_AUTOSWAP=$withval" >&5 printf "%s\n" "DISABLE_NAME_AUTOSWAP=$withval" >&6; } DISABLE_NAME_AUTOSWAP="$withval" printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4041,14 +3974,13 @@ then : printf "%s\n" "MPATH_AVAIL==$withval" >&6; } printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MPATH_AVAIL=$withval" >&5 printf "%s\n" "MPATH_AVAIL=$withval" >&6; } MPATH_AVAIL="$withval" printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4063,14 +3995,13 @@ then : printf "%s\n" "SETTARG=$with_settarg" >&6; } printf "%s\n" "#define SETTARG \"$with_settarg\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SETTARG=$withval" >&5 printf "%s\n" "SETTARG=$withval" >&6; } SETTARG="$withval" printf "%s\n" "#define SETTARG \"$withval\"" >>confdefs.h - ;; -esac + fi DFLT_IGNORE_DIRS=".svn,.git,.hg,.bzr" @@ -4085,14 +4016,13 @@ then : printf "%s\n" "IGNORE_DIRS=$with_ignoreDirs" >&6; } printf "%s\n" "#define IGNORE_DIRS \"$with_ignoreDirs\"" >>confdefs.h -else case e in #( - e) withval="$DFLT_IGNORE_DIRS" +else $as_nop + withval="$DFLT_IGNORE_DIRS" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IGNORE_DIRS=$withval" >&5 printf "%s\n" "IGNORE_DIRS=$withval" >&6; } IGNORE_DIRS="$withval" printf "%s\n" "#define IGNORE_DIRS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4107,14 +4037,13 @@ then : printf "%s\n" "PIN_VERSIONS=$with_pinVersions" >&6; } printf "%s\n" "#define PIN_VERSIONS \"$with_pinVersions\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PIN_VERSIONS=$withval" >&5 printf "%s\n" "PIN_VERSIONS=$withval" >&6; } PIN_VERSIONS="$withval" printf "%s\n" "#define PIN_VERSIONS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4129,14 +4058,13 @@ then : printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$with_downstreamConflicts" >&6; } printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$with_downstreamConflicts\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_DOWNSTREAM_CONFLICTS=$withval" >&5 printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$withval" >&6; } LMOD_DOWNSTREAM_CONFLICTS="$withval" printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4151,14 +4079,13 @@ then : printf "%s\n" "MODULES_AUTO_HANDLING=$with_modulesAutoHandling" >&6; } printf "%s\n" "#define MODULES_AUTO_HANDLING \"$with_modulesAutoHandling\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULES_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULES_AUTO_HANDLING=$withval" >&6; } MODULES_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULES_AUTO_HANDLING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4173,14 +4100,13 @@ then : printf "%s\n" "TMOD_PATH_RULE=$with_tmodPathRule" >&6; } printf "%s\n" "#define TMOD_PATH_RULE \"$with_tmodPathRule\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_PATH_RULE=$withval" >&5 printf "%s\n" "TMOD_PATH_RULE=$withval" >&6; } TMOD_PATH_RULE="$withval" printf "%s\n" "#define TMOD_PATH_RULE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4195,14 +4121,13 @@ then : printf "%s\n" "TMOD_FIND_FIRST=$with_tmodFindFirst" >&6; } printf "%s\n" "#define TMOD_FIND_FIRST \"$with_tmodFindFirst\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_FIND_FIRST=$withval" >&5 printf "%s\n" "TMOD_FIND_FIRST=$withval" >&6; } TMOD_FIND_FIRST="$withval" printf "%s\n" "#define TMOD_FIND_FIRST \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4215,14 +4140,13 @@ then : printf "%s\n" "LUA_INCLUDE=$with_lua_include" >&6; } printf "%s\n" "#define LUA_INCLUDE \"$with_lua_include\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_INCLUDE=$withval" >&5 printf "%s\n" "LUA_INCLUDE=$withval" >&6; } LUA_INCLUDE="$withval" printf "%s\n" "#define LUA_INCLUDE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4237,14 +4161,13 @@ then : printf "%s\n" "CACHED_LOADS=$with_cachedLoads" >&6; } printf "%s\n" "#define CACHED_LOADS \"$with_cachedLoads\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CACHED_LOADS=$withval" >&5 printf "%s\n" "CACHED_LOADS=$withval" >&6; } CACHED_LOADS="$withval" printf "%s\n" "#define CACHED_LOADS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4259,14 +4182,13 @@ then : printf "%s\n" "EXTENDED_DEFAULT=$with_extendedDefault" >&6; } printf "%s\n" "#define EXTENDED_DEFAULT \"$with_extendedDefault\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXTENDED_DEFAULT=$withval" >&5 printf "%s\n" "EXTENDED_DEFAULT=$withval" >&6; } EXTENDED_DEFAULT="$withval" printf "%s\n" "#define EXTENDED_DEFAULT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4281,14 +4203,13 @@ then : printf "%s\n" "SUPPORT_KSH=$with_supportKsh" >&6; } printf "%s\n" "#define SUPPORT_KSH \"$with_supportKsh\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SUPPORT_KSH=$withval" >&5 printf "%s\n" "SUPPORT_KSH=$withval" >&6; } SUPPORT_KSH="$withval" printf "%s\n" "#define SUPPORT_KSH \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4301,14 +4222,13 @@ then : printf "%s\n" "MODULEPATH_INIT=$with_ModulePathInit" >&6; } printf "%s\n" "#define MODULEPATH_INIT \"$with_ModulePathInit\"" >>confdefs.h -else case e in #( - e) withval="@PKG@/init/.modulespath" +else $as_nop + withval="@PKG@/init/.modulespath" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_INIT=$withval" >&5 printf "%s\n" "MODULEPATH_INIT=$withval" >&6; } MODULEPATH_INIT="$withval" printf "%s\n" "#define MODULEPATH_INIT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4323,14 +4243,13 @@ then : printf "%s\n" "SITE_CONTROLLED_PREFIX=$with_siteControlPrefix" >&6; } printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$with_siteControlPrefix\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_CONTROLLED_PREFIX=$withval" >&5 printf "%s\n" "SITE_CONTROLLED_PREFIX=$withval" >&6; } SITE_CONTROLLED_PREFIX="$withval" printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4345,14 +4264,13 @@ then : printf "%s\n" "USE_BUILT_IN_PKGS=$with_useBuiltinPkgs" >&6; } printf "%s\n" "#define USE_BUILT_IN_PKGS \"$with_useBuiltinPkgs\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_BUILT_IN_PKGS=$withval" >&5 printf "%s\n" "USE_BUILT_IN_PKGS=$withval" >&6; } USE_BUILT_IN_PKGS="$withval" printf "%s\n" "#define USE_BUILT_IN_PKGS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4367,14 +4285,13 @@ then : printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$with_useDotConfigDirOnly" >&6; } printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$with_useDotConfigDirOnly\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_DOT_CONFIG_DIR_ONLY=$withval" >&5 printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$withval" >&6; } USE_DOT_CONFIG_DIR_ONLY="$withval" printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4389,14 +4306,13 @@ then : printf "%s\n" "SILENCE_SHELL_DEBUGGING=$with_silentShellDebugging" >&6; } printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$with_silentShellDebugging\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SILENCE_SHELL_DEBUGGING=$withval" >&5 printf "%s\n" "SILENCE_SHELL_DEBUGGING=$withval" >&6; } SILENCE_SHELL_DEBUGGING="$withval" printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4411,14 +4327,13 @@ then : printf "%s\n" "FAST_TCL_INTERP=$with_fastTCLInterp" >&6; } printf "%s\n" "#define FAST_TCL_INTERP \"$with_fastTCLInterp\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FAST_TCL_INTERP=$withval" >&5 printf "%s\n" "FAST_TCL_INTERP=$withval" >&6; } FAST_TCL_INTERP="$withval" printf "%s\n" "#define FAST_TCL_INTERP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4433,14 +4348,13 @@ then : printf "%s\n" "MODULE_AUTO_HANDLING=$with-moduleAutoHandling" >&6; } printf "%s\n" "#define MODULE_AUTO_HANDLING \"$with-moduleAutoHandling\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULE_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULE_AUTO_HANDLING=$withval" >&6; } MODULE_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULE_AUTO_HANDLING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4455,14 +4369,13 @@ then : printf "%s\n" "AVAIL_EXTENSIONS=$with_availExtensions" >&6; } printf "%s\n" "#define AVAIL_EXTENSIONS \"$with_availExtensions\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AVAIL_EXTENSIONS=$withval" >&5 printf "%s\n" "AVAIL_EXTENSIONS=$withval" >&6; } AVAIL_EXTENSIONS="$withval" printf "%s\n" "#define AVAIL_EXTENSIONS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4473,20 +4386,19 @@ then : withval=$with_lua; PATH_TO_LUA="$withval" if test ${PATH_TO_LUA:0:1} != '/' ; then echo "Path to lua must be absolute" - FOUND_ERROR=yes + exit 1 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$with_lua" >&5 printf "%s\n" "PATH_TO_LUA=$with_lua" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$with_lua\"" >>confdefs.h -else case e in #( - e) withval="lua" +else $as_nop + withval="lua" PATH_TO_LUA="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$withval" >&5 printf "%s\n" "PATH_TO_LUA=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4497,20 +4409,19 @@ then : withval=$with_luac; PATH_TO_LUAC="$withval" if test ${PATH_TO_LUAC:0:1} != '/' ; then echo "Path to luac must be absolute" - FOUND_ERROR=yes + exit 1 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$with_luac" >&5 printf "%s\n" "PATH_TO_LUAC=$with_luac" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$with_luac\"" >>confdefs.h -else case e in #( - e) withval="luac" +else $as_nop + withval="luac" PATH_TO_LUAC="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$withval" >&5 printf "%s\n" "PATH_TO_LUAC=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4525,22 +4436,19 @@ then : printf "%s\n" "LUA_SUFFIX=$with_luaSuffic" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$with_luaSuffix\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" LUA_SUFFIX="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_SUFFIX=$withval" >&5 printf "%s\n" "LUA_SUFFIX=$withval" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$withval\"" >>confdefs.h - ;; -esac + fi if test "$ALLOW_TCL_MFILES" = no ; then FAST_TCL_INTERP=no fi -FOUND_ERROR= - if test "$FAST_TCL_INTERP" = yes ; then OS=$(uname -s) if test "$OS" = Darwin ; then @@ -4563,8 +4471,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $pkgConfig in +else $as_nop + case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -4590,7 +4498,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; -esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -4658,30 +4565,22 @@ fi if test "$ac_cv_header_tcl_h" != yes ; then rm -f makefile - FOUND_ERROR=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" >&5 -printf "%s\n" "$as_me: Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" >&6;} + as_fn_error $? "Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" "$LINENO" 5 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing Tcl_CreateInterp" >&5 printf %s "checking for library containing Tcl_CreateInterp... " >&6; } if test ${ac_cv_search_Tcl_CreateInterp+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char Tcl_CreateInterp (void); + builtin and then its argument prototype would still apply. */ +char Tcl_CreateInterp (); int main (void) { @@ -4712,13 +4611,11 @@ done if test ${ac_cv_search_Tcl_CreateInterp+y} then : -else case e in #( - e) ac_cv_search_Tcl_CreateInterp=no ;; -esac +else $as_nop + ac_cv_search_Tcl_CreateInterp=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_Tcl_CreateInterp" >&5 printf "%s\n" "$ac_cv_search_Tcl_CreateInterp" >&6; } @@ -4727,10 +4624,8 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else case e in #( - e) rm -f makefile; FOUND_ERROR=yes; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" >&5 -printf "%s\n" "$as_me: Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" >&6;} ;; -esac +else $as_nop + rm -f makefile; as_fn_error $? "Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" "$LINENO" 5 fi @@ -4772,7 +4667,7 @@ if test $MODE != "user_default" ; then echo "Please try setting mode to 755 or 750 or 700 or similar." echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi fi @@ -4784,8 +4679,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PS+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PS in +else $as_nop + case $PS in [\\/]* | ?:[\\/]*) ac_cv_path_PS="$PS" # Let the user override the test with a path. ;; @@ -4811,7 +4706,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PS" && ac_cv_path_PS="UNKNOWN_PS" ;; -esac ;; esac fi PS=$ac_cv_path_PS @@ -4829,7 +4723,7 @@ if test "$PS" = "UNKNOWN_PS" ; then echo "You must have valid ps in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi # Extract the first word of "readlink", so it can be a program name with args. @@ -4839,8 +4733,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_READLINK+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $READLINK in +else $as_nop + case $READLINK in [\\/]* | ?:[\\/]*) ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path. ;; @@ -4866,7 +4760,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_READLINK" && ac_cv_path_READLINK="UNKNOWN_READLINK" ;; -esac ;; esac fi READLINK=$ac_cv_path_READLINK @@ -4884,7 +4777,7 @@ if test "$READLINK" = "UNKNOWN_READLINK" ; then echo "You must have valid ps in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi for ac_prog in gexpr expr @@ -4896,8 +4789,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_EXPR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $EXPR in +else $as_nop + case $EXPR in [\\/]* | ?:[\\/]*) ac_cv_path_EXPR="$EXPR" # Let the user override the test with a path. ;; @@ -4922,7 +4815,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi EXPR=$ac_cv_path_EXPR @@ -4944,7 +4836,7 @@ if test "$EXPR" = "UNKNOWN_EXPR" ; then echo "You must have valid expr or gexpr in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi for ac_prog in gbasename basename @@ -4956,8 +4848,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BASENAME+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $BASENAME in +else $as_nop + case $BASENAME in [\\/]* | ?:[\\/]*) ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path. ;; @@ -4982,7 +4874,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi BASENAME=$ac_cv_path_BASENAME @@ -5004,7 +4895,7 @@ if test "$BASENAME" = "UNKNOWN_BASENAME" ; then echo "You must have either basename or gbasename in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi for ac_prog in bc @@ -5016,8 +4907,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $BC in +else $as_nop + case $BC in [\\/]* | ?:[\\/]*) ac_cv_path_BC="$BC" # Let the user override the test with a path. ;; @@ -5042,7 +4933,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi BC=$ac_cv_path_BC @@ -5064,7 +4954,7 @@ if test "$BC" = "UNKNOWN_BC" ; then echo "You must have bc in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi # Extract the first word of "pod2man", so it can be a program name with args. @@ -5074,8 +4964,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_POD2MAN+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_POD2MAN in +else $as_nop + case $PATH_TO_POD2MAN in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_POD2MAN="$PATH_TO_POD2MAN" # Let the user override the test with a path. ;; @@ -5101,7 +4991,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_POD2MAN" && ac_cv_path_PATH_TO_POD2MAN="UNKNOWN_POD2MAN" ;; -esac ;; esac fi PATH_TO_POD2MAN=$ac_cv_path_PATH_TO_POD2MAN @@ -5122,8 +5011,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_GIT+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_GIT in +else $as_nop + case $PATH_TO_GIT in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_GIT="$PATH_TO_GIT" # Let the user override the test with a path. ;; @@ -5149,7 +5038,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_GIT" && ac_cv_path_PATH_TO_GIT="""" ;; -esac ;; esac fi PATH_TO_GIT=$ac_cv_path_PATH_TO_GIT @@ -5171,8 +5059,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_PAGER+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_PAGER in +else $as_nop + case $PATH_TO_PAGER in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_PAGER="$PATH_TO_PAGER" # Let the user override the test with a path. ;; @@ -5197,7 +5085,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_PAGER=$ac_cv_path_PATH_TO_PAGER @@ -5224,8 +5111,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_HASHSUM+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_HASHSUM in +else $as_nop + case $PATH_TO_HASHSUM in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_HASHSUM="$PATH_TO_HASHSUM" # Let the user override the test with a path. ;; @@ -5250,7 +5137,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_HASHSUM=$ac_cv_path_PATH_TO_HASHSUM @@ -5274,7 +5160,7 @@ elif test "$PATH_TO_HASHSUM" = "UNKNOWN_HASHSUM" ; then echo "You must have either sha1sum, shasum, md5sum or md5 in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi # Extract the first word of "tclsh", so it can be a program name with args. @@ -5284,8 +5170,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TCLSH+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_TCLSH in +else $as_nop + case $PATH_TO_TCLSH in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TCLSH="$PATH_TO_TCLSH" # Let the user override the test with a path. ;; @@ -5311,7 +5197,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_TCLSH" && ac_cv_path_PATH_TO_TCLSH="UNKNOWN_TCLSH" ;; -esac ;; esac fi PATH_TO_TCLSH=$ac_cv_path_PATH_TO_TCLSH @@ -5329,7 +5214,7 @@ if test "$PATH_TO_TCLSH" = "UNKNOWN_TCLSH" -a "$ALLOW_TCL_MFILES" = yes; then echo "The tclsh program must be in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi for ac_prog in gtr tr do @@ -5340,8 +5225,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_TR in +else $as_nop + case $PATH_TO_TR in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TR="$PATH_TO_TR" # Let the user override the test with a path. ;; @@ -5366,7 +5251,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_TR=$ac_cv_path_PATH_TO_TR @@ -5392,8 +5276,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_LS+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_LS in +else $as_nop + case $PATH_TO_LS in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_LS="$PATH_TO_LS" # Let the user override the test with a path. ;; @@ -5418,7 +5302,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_LS=$ac_cv_path_PATH_TO_LS @@ -5443,14 +5326,14 @@ test -n "$PATH_TO_LS" || PATH_TO_LS="""" if ! command -v $PATH_TO_LUA &>/dev/null ; then echo 'The program "'$PATH_TO_LUA'" must be in your path' rm -f makefile - FOUND_ERROR=yes + exit 1 fi if test "${LUA_SUFFIX}" != no ; then if test "${PATH_TO_LUA:0:1}" = '/' -o "${PATH_TO_LUAC:0:1}" = '/'; then echo "Neither --with-lua= nor --with-luac= can be used with --with-luaSuffix=" rm -f makefile - FOUND_ERROR=yes + exit 1 fi PATH_TO_LUA=lua$LUA_SUFFIX PATH_TO_LUAC=luac$LUA_SUFFIX @@ -5466,14 +5349,14 @@ else if test "$mismatch" = true ; then echo "Both --with-lua= and --with-luac= must both be specified" rm -f makefile - FOUND_ERROR=yes + exit 1 fi fi if ! command -v $PATH_TO_LUA &>/dev/null ; then echo 'The program "'$PATH_TO_LUA'" must be in your path' rm -f makefile - FOUND_ERROR=yes + exit 1 fi if test ${PATH_TO_LUA:0:1} != '/' ; then @@ -5484,8 +5367,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUA+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $FIND_PATH_TO_LUA in +else $as_nop + case $FIND_PATH_TO_LUA in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUA="$FIND_PATH_TO_LUA" # Let the user override the test with a path. ;; @@ -5510,7 +5393,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi FIND_PATH_TO_LUA=$ac_cv_path_FIND_PATH_TO_LUA @@ -5529,7 +5411,7 @@ fi if ! command -v $PATH_TO_LUAC &>/dev/null ; then echo 'The program "'$PATH_TO_LUAC'" must be in your path' rm -f makefile - FOUND_ERROR=yes + exit 1 fi if test "${PATH_TO_LUAC:0:1}" != '/' ; then @@ -5540,8 +5422,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUAC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $FIND_PATH_TO_LUAC in +else $as_nop + case $FIND_PATH_TO_LUAC in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUAC="$FIND_PATH_TO_LUAC" # Let the user override the test with a path. ;; @@ -5566,7 +5448,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi FIND_PATH_TO_LUAC=$ac_cv_path_FIND_PATH_TO_LUAC @@ -5599,7 +5480,7 @@ IntLuaV=$( $PATH_TO_LUA -e "_,_,M,m=_VERSION:gsub('Lua%s+',''):find('(%d+)%.(%d if test $IntLuaV -lt 5001 -o $IntLuaV -gt 5004; then echo "Error: Lmod requires versions 5.1, 5.2, 5.3, or 5.4 You have: $LuaV" rm -f makefile - FOUND_ERROR=yes + exit 1 fi echo "... $LuaV" @@ -5640,7 +5521,7 @@ if test -n "$missingModules" ; then echo "" echo "You can not run Lmod without: $missingModules" rm -f makefile - FOUND_ERROR=yes + exit 1 else echo "... yes" fi @@ -5713,8 +5594,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $pkgConfig in +else $as_nop + case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -5740,7 +5621,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; -esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -5781,21 +5661,13 @@ if ! test "$HAVE_LUA_TERM" = yes; then echo Quitting! echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi fi ##### LUA configuration -- end -if test $FOUND_ERROR = yes; then - echo - echo One or more errors found -> Quiting! - echo - rm -f makefile - exit 1; -fi - # Extract the first word of "zsh", so it can be a program name with args. set dummy zsh; ac_word=$2 @@ -5804,8 +5676,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ZSH+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $ZSH in +else $as_nop + case $ZSH in [\\/]* | ?:[\\/]*) ac_cv_path_ZSH="$ZSH" # Let the user override the test with a path. ;; @@ -5830,7 +5702,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi ZSH=$ac_cv_path_ZSH @@ -5875,6 +5746,33 @@ EOF rm conftest.zsh fi + +if test -n "$PATH_TO_ZSH" ; then + cat > conftest.zsh << 'EOF' +echo $ZSH_VERSION +EOF + chmod +x conftest.zsh + ORIG_ZSH_VERSION=`$PATH_TO_ZSH -f ./conftest.zsh 2> /dev/null` + rm conftest.zsh +fi + + + +if test -n "$PATH_TO_ZSH" ; then + cat > conftest.zsh << 'EOF' +echo $FPATH +EOF + + chmod +x conftest.zsh + + unset FPATH + ZSH_FPATH=`$PATH_TO_ZSH -f ./conftest.zsh 2> /dev/null` + + rm conftest.zsh +fi + + + ac_config_files="$ac_config_files makefile:Makefile.in" cat >confcache <<\_ACEOF @@ -5887,8 +5785,8 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# 'ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* 'ac_cv_foo' will be assigned the +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. _ACEOF @@ -5918,14 +5816,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # 'set' does not quote correctly, so add quotes: double-quote + # `set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # 'set' quotes correctly as required by POSIX, so do not add quotes. + # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -5989,7 +5887,9 @@ s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g t quote b any :quote -s/[][ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g s/\$/$$/g H :any @@ -6049,6 +5949,7 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -6057,13 +5958,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else case e in #( - e) case `(set -o) 2>/dev/null` in #( +else $as_nop + case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi @@ -6135,7 +6035,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as 'sh COMMAND' +# We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -6164,6 +6064,7 @@ as_fn_error () } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -6203,12 +6104,11 @@ then : { eval $1+=\$2 }' -else case e in #( - e) as_fn_append () +else $as_nop + as_fn_append () { eval $1=\$$1\$2 - } ;; -esac + } fi # as_fn_append # as_fn_arith ARG... @@ -6222,12 +6122,11 @@ then : { as_val=$(( $* )) }' -else case e in #( - e) as_fn_arith () +else $as_nop + as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } ;; -esac + } fi # as_fn_arith @@ -6310,9 +6209,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. - # In both cases, we have to default to 'cp -pR'. + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -6393,12 +6292,10 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -as_tr_sh="eval sed '$as_sed_sh'" # deprecated +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" exec 6>&1 @@ -6414,7 +6311,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.72. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6441,7 +6338,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -'$as_me' instantiates files and other configuration actions +\`$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -6469,10 +6366,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.72, +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2023 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -6529,8 +6426,8 @@ do ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: '$1' -Try '$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -6580,7 +6477,7 @@ do case $ac_config_target in "makefile") CONFIG_FILES="$CONFIG_FILES makefile:Makefile.in" ;; - *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -6598,7 +6495,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to '$tmp'. +# after its creation but before its name has been assigned to `$tmp'. $debug || { tmp= ac_tmp= @@ -6622,7 +6519,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with './config.status config.h'. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -6788,7 +6685,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6810,19 +6707,19 @@ do -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain ':'. + # because $ac_f cannot contain `:'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is 'configure' which instantiates (i.e., don't + # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` @@ -6946,7 +6843,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when '$srcdir' = '.'. +# Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -6975,9 +6872,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" diff --git a/configure.ac b/configure.ac index cfe0a3ed5..e55bf3682 100644 --- a/configure.ac +++ b/configure.ac @@ -652,7 +652,7 @@ AC_ARG_WITH(lua, PATH_TO_LUA="$withval" if test ${PATH_TO_LUA:0:1} != '/' ; then echo "Path to lua must be absolute" - FOUND_ERROR=yes + exit 1 fi AC_MSG_RESULT([PATH_TO_LUA=$with_lua]) AC_DEFINE_UNQUOTED(PATH_TO_LUA, "$with_lua")dnl @@ -668,7 +668,7 @@ AC_ARG_WITH(luac, PATH_TO_LUAC="$withval" if test ${PATH_TO_LUAC:0:1} != '/' ; then echo "Path to luac must be absolute" - FOUND_ERROR=yes + exit 1 fi AC_MSG_RESULT([PATH_TO_LUAC=$with_luac]) AC_DEFINE_UNQUOTED(PATH_TO_LUAC, "$with_luac")dnl @@ -696,8 +696,6 @@ if test "$ALLOW_TCL_MFILES" = no ; then FAST_TCL_INTERP=no fi -FOUND_ERROR= - if test "$FAST_TCL_INTERP" = yes ; then OS=$(uname -s) if test "$OS" = Darwin ; then @@ -733,11 +731,10 @@ if test "$FAST_TCL_INTERP" = yes ; then if test "$ac_cv_header_tcl_h" != yes ; then rm -f makefile - FOUND_ERROR=yes - AC_MSG_NOTICE([Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h]) + AC_MSG_ERROR([Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h]) fi AC_SEARCH_LIBS(Tcl_CreateInterp, [tcl] [tcl8.8] [tcl8.7] [tcl8.6] [tcl8.5],[], - [rm -f makefile; FOUND_ERROR=yes; AC_MSG_NOTICE([Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library])], [$TCL_LIBS]) + [rm -f makefile; AC_MSG_ERROR([Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library])], [$TCL_LIBS]) AC_SUBST(TCL_INCLUDE, "$TCL_INCLUDE") AC_SUBST(TCL_LIBS, "$TCL_LIBS") @@ -775,7 +772,7 @@ if test $MODE != "user_default" ; then echo "Please try setting mode to 755 or 750 or 700 or similar." echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi fi @@ -786,7 +783,7 @@ if test "$PS" = "UNKNOWN_PS" ; then echo "You must have valid ps in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi AC_PATH_PROG(READLINK,readlink, UNKNOWN_READLINK) @@ -795,7 +792,7 @@ if test "$READLINK" = "UNKNOWN_READLINK" ; then echo "You must have valid ps in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi AC_PATH_PROGS(EXPR,[gexpr] [expr], UNKNOWN_EXPR) @@ -804,7 +801,7 @@ if test "$EXPR" = "UNKNOWN_EXPR" ; then echo "You must have valid expr or gexpr in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi AC_PATH_PROGS(BASENAME, [gbasename] [basename], UNKNOWN_BASENAME) @@ -813,7 +810,7 @@ if test "$BASENAME" = "UNKNOWN_BASENAME" ; then echo "You must have either basename or gbasename in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi AC_PATH_PROGS(BC, [bc], UNKNOWN_BC) @@ -822,7 +819,7 @@ if test "$BC" = "UNKNOWN_BC" ; then echo "You must have bc in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi AC_PATH_PROG(PATH_TO_POD2MAN, pod2man, UNKNOWN_POD2MAN) @@ -838,7 +835,7 @@ elif test "$PATH_TO_HASHSUM" = "UNKNOWN_HASHSUM" ; then echo "You must have either sha1sum, shasum, md5sum or md5 in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi AC_PATH_PROG(PATH_TO_TCLSH, tclsh, UNKNOWN_TCLSH) @@ -847,7 +844,7 @@ if test "$PATH_TO_TCLSH" = "UNKNOWN_TCLSH" -a "$ALLOW_TCL_MFILES" = yes; then echo "The tclsh program must be in your path. Quitting!" echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi AC_PATH_PROGS(PATH_TO_TR, [gtr] [tr],"") AC_PATH_PROGS(PATH_TO_LS, [gls] [ls], "") @@ -859,14 +856,14 @@ AC_PATH_PROGS(PATH_TO_LS, [gls] [ls], "") if ! command -v $PATH_TO_LUA &>/dev/null ; then echo 'The program "'$PATH_TO_LUA'" must be in your path' rm -f makefile - FOUND_ERROR=yes + exit 1 fi if test "${LUA_SUFFIX}" != no ; then if test "${PATH_TO_LUA:0:1}" = '/' -o "${PATH_TO_LUAC:0:1}" = '/'; then echo "Neither --with-lua= nor --with-luac= can be used with --with-luaSuffix=" rm -f makefile - FOUND_ERROR=yes + exit 1 fi PATH_TO_LUA=lua$LUA_SUFFIX PATH_TO_LUAC=luac$LUA_SUFFIX @@ -882,14 +879,14 @@ else if test "$mismatch" = true ; then echo "Both --with-lua= and --with-luac= must both be specified" rm -f makefile - FOUND_ERROR=yes + exit 1 fi fi if ! command -v $PATH_TO_LUA &>/dev/null ; then echo 'The program "'$PATH_TO_LUA'" must be in your path' rm -f makefile - FOUND_ERROR=yes + exit 1 fi if test ${PATH_TO_LUA:0:1} != '/' ; then @@ -900,7 +897,7 @@ fi if ! command -v $PATH_TO_LUAC &>/dev/null ; then echo 'The program "'$PATH_TO_LUAC'" must be in your path' rm -f makefile - FOUND_ERROR=yes + exit 1 fi if test "${PATH_TO_LUAC:0:1}" != '/' ; then @@ -925,7 +922,7 @@ IntLuaV=$( $PATH_TO_LUA -e "_,_,M,m=_VERSION:gsub('Lua%s+',''):find('(%d+)%.(%d if test $IntLuaV -lt 5001 -o $IntLuaV -gt 5004; then echo "Error: Lmod requires versions 5.1, 5.2, 5.3, or 5.4 You have: $LuaV" rm -f makefile - FOUND_ERROR=yes + exit 1 fi echo "... $LuaV" @@ -966,7 +963,7 @@ if test -n "$missingModules" ; then echo "" echo "You can not run Lmod without: $missingModules" rm -f makefile - FOUND_ERROR=yes + exit 1 else echo "... yes" fi @@ -1057,21 +1054,13 @@ if ! test "$HAVE_LUA_TERM" = yes; then echo Quitting! echo rm -f makefile - FOUND_ERROR=yes + exit 1 fi fi ##### LUA configuration -- end -if test $FOUND_ERROR = yes; then - echo - echo One or more errors found -> Quiting! - echo - rm -f makefile - exit 1; -fi - AC_SUBST(ZSH_SITE_FUNCTIONS_DIRS) AC_PATH_PROG(ZSH, zsh) PATH_TO_ZSH=$ZSH @@ -1106,6 +1095,33 @@ EOF rm conftest.zsh fi +AC_SUBST(ORIG_ZSH_VERSION) +if test -n "$PATH_TO_ZSH" ; then + cat > conftest.zsh << 'EOF' +echo $ZSH_VERSION +EOF + chmod +x conftest.zsh + ORIG_ZSH_VERSION=`$PATH_TO_ZSH -f ./conftest.zsh 2> /dev/null` + rm conftest.zsh +fi + + +AC_SUBST(ZSH_FPATH) +if test -n "$PATH_TO_ZSH" ; then + cat > conftest.zsh << 'EOF' +echo $FPATH +EOF + + chmod +x conftest.zsh + + unset FPATH + ZSH_FPATH=`$PATH_TO_ZSH -f ./conftest.zsh 2> /dev/null` + + rm conftest.zsh +fi + + + AC_CONFIG_FILES([makefile:Makefile.in]) AC_OUTPUT From a123eff575b80e5166b75cf2bb8bac8a5571e007 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Wed, 31 Jul 2024 14:36:28 -0500 Subject: [PATCH 036/198] Update README.new w.r.t. FPATH changes --- README.new | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.new b/README.new index 071e7c64d..afa635530 100644 --- a/README.new +++ b/README.new @@ -165,4 +165,4 @@ Lmod 8.7+ W.I.P: (8.7.48) * Issue #717: Keep previous varT when restoring a collection. Otherwise the previous modules env vars. are lost and therefore not purged. - * Change configure.ac to run all tests before erroring out + * Issue #718: use __build_FPATH_for_zsh_ksh to build FPATH for both shells From b6185a8f04c3a02be2a5dfa7aacb494b938ce98a Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Wed, 31 Jul 2024 14:39:13 -0500 Subject: [PATCH 037/198] Update README.new --- README.new | 1 - 1 file changed, 1 deletion(-) diff --git a/README.new b/README.new index 071e7c64d..dc5fe82d2 100644 --- a/README.new +++ b/README.new @@ -165,4 +165,3 @@ Lmod 8.7+ W.I.P: (8.7.48) * Issue #717: Keep previous varT when restoring a collection. Otherwise the previous modules env vars. are lost and therefore not purged. - * Change configure.ac to run all tests before erroring out From 092efb489a4034e2ac4cfedc646074be977708c8 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Wed, 31 Jul 2024 15:20:52 -0500 Subject: [PATCH 038/198] update --- tools/Optiks.lua | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/tools/Optiks.lua b/tools/Optiks.lua index c5f3396d6..ba7eaf389 100644 --- a/tools/Optiks.lua +++ b/tools/Optiks.lua @@ -96,7 +96,6 @@ function M.new(self, t) self.argNames = {} self.optA = {} - local descript = "" local envArg = nil local usage = t local version = nil @@ -105,7 +104,6 @@ function M.new(self, t) ProgName = t.progName version = t.version envArg = t.envArg - descript = t.descript Error = t.error or Error l_prt = t.prt or l_prt @@ -119,14 +117,12 @@ function M.new(self, t) ProgName = ProgName .. " " end - o.progName = ProgName o.exit = Exit o.prt = l_prt o.prtEnd = l_prtend o.usage = usage o.version = version o.envArg = envArg - o.descript = descript if (usage == nil) then local cmd = arg[0] local i,j = cmd:find(".*/") @@ -351,7 +347,7 @@ end function M.buildHelpMsg(self) local term_width = TermWidth() local b = {} - b[#b+1] = "Usage: " .. self.usage + b[#b+1] = self.usage b[#b+1] = "\n\nOptions:\n" local a = {} @@ -376,28 +372,6 @@ function M.printHelp(self) self.exit(0) end -function M.buildManPod(self) - local b = {} - b[#b+1] = "=encoding UTF-8" - b[#b+1] = self.progName - b[#b+1] = "=head1 SYNOPSIS" - b[#b+1] = self.usage - b[#b+1] = "=head1 DESCRIPTION" - b[#b+1] = self.descript - b[#b+1] = "=head1 OPTIONS" - b[#b+1] = "=over 4" - local a = {} - for _, v in ipairs(self.optA) do - local opt = v.table - a[#a+1] = "=item I<"..self.dispTbl[opt.action](self, opt)..">" - a[#a+1] = opt.help or " " - end - b[#b+1] = concatTbl(a,"\n\n") - - b[#b+1] = "=back" - return concatTbl(b,"\n\n") -end - -------------------------------------------------------------------------- -- Parse an environment variable before parsing the command line. From e335b0c0bdbfff5b50b8e385c33489256139413b Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Wed, 31 Jul 2024 16:45:20 -0500 Subject: [PATCH 039/198] configure foo --- configure | 985 ++++++++++++++++++++++++------------------------------ 1 file changed, 433 insertions(+), 552 deletions(-) diff --git a/configure b/configure index 132d7611f..3a0d809bf 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72. +# Generated by GNU Autoconf 2.71. # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, # Inc. # # @@ -15,6 +15,7 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -23,13 +24,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else case e in #( - e) case `(set -o) 2>/dev/null` in #( +else $as_nop + case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi @@ -101,7 +101,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as 'sh COMMAND' +# We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -131,14 +131,15 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed 'exec'. +# out after a failed `exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh NULLCMD=: @@ -146,13 +147,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else case e in #( - e) case \`(set -o) 2>/dev/null\` in #( +else \$as_nop + case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi " @@ -170,9 +170,8 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : -else case e in #( - e) exitcode=1; echo positional parameters were not saved. ;; -esac +else \$as_nop + exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 blah=\$(echo \$(echo blah)) @@ -185,15 +184,14 @@ test -x / || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes -else case e in #( - e) as_have_required=no ;; -esac +else $as_nop + as_have_required=no fi if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null then : -else case e in #( - e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else $as_nop + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do @@ -226,13 +224,12 @@ IFS=$as_save_IFS if $as_found then : -else case e in #( - e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null then : CONFIG_SHELL=$SHELL as_have_required=yes -fi ;; -esac +fi fi @@ -254,7 +251,7 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed 'exec'. +# out after a failed `exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -273,8 +270,7 @@ $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." fi exit 1 -fi ;; -esac +fi fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -313,6 +309,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -381,12 +385,11 @@ then : { eval $1+=\$2 }' -else case e in #( - e) as_fn_append () +else $as_nop + as_fn_append () { eval $1=\$$1\$2 - } ;; -esac + } fi # as_fn_append # as_fn_arith ARG... @@ -400,14 +403,21 @@ then : { as_val=$(( $* )) }' -else case e in #( - e) as_fn_arith () +else $as_nop + as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } ;; -esac + } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -481,8 +491,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' - t clear - :clear s/[$]LINENO.*/&-/ t lineno b @@ -531,6 +539,7 @@ esac as_echo='printf %s\n' as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -542,9 +551,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. - # In both cases, we have to default to 'cp -pR'. + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -569,12 +578,10 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -as_tr_sh="eval sed '$as_sed_sh'" # deprecated +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" test -n "$DJDIR" || exec 7<&0 /dev/null && - as_fn_error $? "invalid feature name: '$ac_useropt'" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -955,7 +962,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: '$ac_useropt'" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1168,7 +1175,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: '$ac_useropt'" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1184,7 +1191,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: '$ac_useropt'" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1214,8 +1221,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: '$ac_option' -Try '$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1223,7 +1230,7 @@ Try '$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: '$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1273,7 +1280,7 @@ do as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: '$host' +# There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -1341,7 +1348,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -1369,7 +1376,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures this package to adapt to many kinds of systems. +\`configure' configures this package to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1383,11 +1390,11 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print 'checking ...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for '--cache-file=config.cache' + -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or '..'] + --srcdir=DIR find the sources in DIR [configure dir or \`..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1395,10 +1402,10 @@ Installation directories: --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, 'make install' will install all the files in -'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify -an installation prefix other than '$ac_default_prefix' using '--prefix', -for instance '--prefix=\$HOME'. +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. For better control, use the options below. @@ -1537,7 +1544,7 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory -Use these variables to override the choices made by 'configure' or to help +Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to the package provider. @@ -1605,9 +1612,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.72 +generated by GNU Autoconf 2.71 -Copyright (C) 2023 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1646,12 +1653,11 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + ac_retval=1 fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1670,8 +1676,8 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> @@ -1679,12 +1685,10 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac +else $as_nop + eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -1724,12 +1728,11 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + ac_retval=1 fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -1765,7 +1768,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.72. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2011,10 +2014,10 @@ esac printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See 'config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2050,7 +2053,9 @@ struct stat; /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (char **p, int i) +static char *e (p, i) + char **p; + int i; { return p[i]; } @@ -2064,21 +2069,6 @@ static char *f (char * (*g) (char **, int), char **p, ...) return s; } -/* C89 style stringification. */ -#define noexpand_stringify(a) #a -const char *stringified = noexpand_stringify(arbitrary+token=sequence); - -/* C89 style token pasting. Exercises some of the corner cases that - e.g. old MSVC gets wrong, but not very hard. */ -#define noexpand_concat(a,b) a##b -#define expand_concat(a,b) noexpand_concat(a,b) -extern int vA; -extern int vbee; -#define aye A -#define bee B -int *pvA = &expand_concat(v,aye); -int *pvbee = &noexpand_concat(v,bee); - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not \xHH hex character constants. These do not provoke an error unfortunately, instead are silently treated @@ -2106,19 +2096,16 @@ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); # Test code for whether the C compiler supports C99 (global declarations) ac_c_conftest_c99_globals=' -/* Does the compiler advertise C99 conformance? */ +// Does the compiler advertise C99 conformance? #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L # error "Compiler does not advertise C99 conformance" #endif -// See if C++-style comments work. - #include extern int puts (const char *); extern int printf (const char *, ...); extern int dprintf (int, const char *, ...); extern void *malloc (size_t); -extern void free (void *); // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare @@ -2168,6 +2155,7 @@ typedef const char *ccp; static inline int test_restrict (ccp restrict text) { + // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) @@ -2233,8 +2221,6 @@ ac_c_conftest_c99_main=' ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; - // Work around memory leak warnings. - free (ia); // Check named initializers. struct named_init ni = { @@ -2256,7 +2242,7 @@ ac_c_conftest_c99_main=' # Test code for whether the C compiler supports C11 (global declarations) ac_c_conftest_c11_globals=' -/* Does the compiler advertise C11 conformance? */ +// Does the compiler advertise C11 conformance? #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L # error "Compiler does not advertise C11 conformance" #endif @@ -2379,12 +2365,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2393,18 +2379,18 @@ printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -2420,11 +2406,11 @@ printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## @@ -2462,8 +2448,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2485,8 +2471,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2508,8 +2493,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2531,8 +2516,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2567,8 +2551,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2590,8 +2574,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2613,8 +2596,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -2653,8 +2636,7 @@ if test $ac_prog_rejected = yes; then ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2678,8 +2660,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2701,8 +2683,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2728,8 +2709,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2751,8 +2732,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2790,8 +2770,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2813,8 +2793,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2836,8 +2815,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2859,8 +2838,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2889,10 +2867,10 @@ fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See 'config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2964,8 +2942,8 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. -# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -2985,7 +2963,7 @@ do ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an '-o' + # safe: cross compilers may not add the suffix if given an `-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -2996,9 +2974,8 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else case e in #( - e) ac_file='' ;; -esac +else $as_nop + ac_file='' fi if test -z "$ac_file" then : @@ -3007,14 +2984,13 @@ printf "%s\n" "no" >&6; } printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See 'config.log' for more details" "$LINENO" 5; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 printf %s "checking for C compiler default output file name... " >&6; } @@ -3038,10 +3014,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) -# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will -# work properly (i.e., refer to 'conftest.exe'), while it won't with -# 'rm'. + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -3051,12 +3027,11 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else case e in #( - e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See 'config.log' for more details" "$LINENO" 5; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3072,8 +3047,6 @@ int main (void) { FILE *f = fopen ("conftest.out", "w"); - if (!f) - return 1; return ferror (f) || fclose (f) != 0; ; @@ -3113,27 +3086,26 @@ printf "%s\n" "$ac_try_echo"; } >&5 if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use '--host'. -See 'config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext \ - conftest.o conftest.obj conftest.out +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } if test ${ac_cv_objext+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3165,18 +3137,16 @@ then : break;; esac done -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See 'config.log' for more details" "$LINENO" 5; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; -esac +rm -f conftest.$ac_cv_objext conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 printf "%s\n" "$ac_cv_objext" >&6; } @@ -3187,8 +3157,8 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } if test ${ac_cv_c_compiler_gnu+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3205,14 +3175,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes -else case e in #( - e) ac_compiler_gnu=no ;; -esac +else $as_nop + ac_compiler_gnu=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } @@ -3230,8 +3198,8 @@ printf %s "checking whether $CC accepts -g... " >&6; } if test ${ac_cv_prog_cc_g+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_save_c_werror_flag=$ac_c_werror_flag +else $as_nop + ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -3249,8 +3217,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes -else case e in #( - e) CFLAGS="" +else $as_nop + CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3265,8 +3233,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else case e in #( - e) ac_c_werror_flag=$ac_save_c_werror_flag +else $as_nop + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3283,15 +3251,12 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag ;; -esac + ac_c_werror_flag=$ac_save_c_werror_flag fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 printf "%s\n" "$ac_cv_prog_cc_g" >&6; } @@ -3318,8 +3283,8 @@ printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c11=no +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3336,28 +3301,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c11" = x +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" ;; -esac + CC="$CC $ac_cv_prog_cc_c11" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 ;; -esac + ac_prog_cc_stdc=c11 fi fi if test x$ac_prog_cc_stdc = xno @@ -3367,8 +3329,8 @@ printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c99=no +else $as_nop + ac_cv_prog_cc_c99=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3385,28 +3347,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c99" = x +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" ;; -esac + CC="$CC $ac_cv_prog_cc_c99" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 ;; -esac + ac_prog_cc_stdc=c99 fi fi if test x$ac_prog_cc_stdc = xno @@ -3416,8 +3375,8 @@ printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c89=no +else $as_nop + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3434,28 +3393,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c89" = x +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" ;; -esac + CC="$CC $ac_cv_prog_cc_c89" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 ;; -esac + ac_prog_cc_stdc=c89 fi fi @@ -3515,14 +3471,13 @@ then : printf "%s\n" "DUPLICATE_PATHS=$with_duplicatePaths" >&6; } printf "%s\n" "#define DUPLICATE_PATHS \"$with_duplicatePaths\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DUPLICATE_PATHS=$withval" >&5 printf "%s\n" "DUPLICATE_PATHS=$withval" >&6; } DUPLICATE_PATHS="$withval" printf "%s\n" "#define DUPLICATE_PATHS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3537,14 +3492,13 @@ then : printf "%s\n" "LMOD_ALLOW_ROOT_USE=$with_allowRootUse" >&6; } printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$with_allowRootUse\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_ALLOW_ROOT_USE=$withval" >&5 printf "%s\n" "LMOD_ALLOW_ROOT_USE=$withval" >&6; } LMOD_ALLOW_ROOT_USE="$withval" printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3557,14 +3511,13 @@ then : printf "%s\n" "SITE_MSG_FILE=$with_siteMsgFile" >&6; } printf "%s\n" "#define SITE_MSG_FILE \"$with_siteMsgFile\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_MSG_FILE=$withval" >&5 printf "%s\n" "SITE_MSG_FILE=$withval" >&6; } SITE_MSG_FILE="$withval" printf "%s\n" "#define SITE_MSG_FILE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3577,14 +3530,13 @@ then : printf "%s\n" "LMOD_OVERRIDE_LANG=$with_lang" >&6; } printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$with_lang\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_OVERRIDE_LANG=$withval" >&5 printf "%s\n" "LMOD_OVERRIDE_LANG=$withval" >&6; } LMOD_OVERRIDE_LANG="$withval" printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3599,14 +3551,13 @@ then : printf "%s\n" "CASE_INDEPENDENT_SORTING=$with_caseIndependentSorting" >&6; } printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$with_caseIndependentSorting\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CASE_INDEPENDENT_SORTING=$withval" >&5 printf "%s\n" "CASE_INDEPENDENT_SORTING=$withval" >&6; } CASE_INDEPENDENT_SORTING="$withval" printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3621,14 +3572,13 @@ then : printf "%s\n" "COLORIZE=$with_colorize" >&6; } printf "%s\n" "#define COLORIZE \"$with_colorize\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: COLORIZE=$withval" >&5 printf "%s\n" "COLORIZE=$withval" >&6; } COLORIZE="$withval" printf "%s\n" "#define COLORIZE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3643,14 +3593,13 @@ then : printf "%s\n" "DYNAMIC_SPIDER_CACHE=$with_dynamicSpiderCache" >&6; } printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$with_dynamicSpiderCache\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DYNAMIC_SPIDER_CACHE=$withval" >&5 printf "%s\n" "DYNAMIC_SPIDER_CACHE=$withval" >&6; } DYNAMIC_SPIDER_CACHE="$withval" printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3665,14 +3614,13 @@ then : printf "%s\n" "HIDDEN_ITALIC=$with_hiddenItalic" >&6; } printf "%s\n" "#define HIDDEN_ITALIC \"$with_hiddenItalic\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HIDDEN_ITALIC=$withval" >&5 printf "%s\n" "HIDDEN_ITALIC=$withval" >&6; } HIDDEN_ITALIC="$withval" printf "%s\n" "#define HIDDEN_ITALIC \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3687,14 +3635,13 @@ then : printf "%s\n" "EXACT_MATCH=$with_exactMatch" >&6; } printf "%s\n" "#define EXACT_MATCH \"$with_exactMatch\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXACT_MATCH=$withval" >&5 printf "%s\n" "EXACT_MATCH=$withval" >&6; } EXACT_MATCH="$withval" printf "%s\n" "#define EXACT_MATCH \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3708,14 +3655,13 @@ then : printf "%s\n" "MODE=$with_mode" >&6; } printf "%s\n" "#define MODE \"$with_mode\"" >>confdefs.h -else case e in #( - e) withval="user_default" +else $as_nop + withval="user_default" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODE=$withval" >&5 printf "%s\n" "MODE=$withval" >&6; } MODE="$withval" printf "%s\n" "#define MODE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3728,14 +3674,13 @@ then : printf "%s\n" "LMOD_CONFIG_DIR=$with_lmodConfigDir" >&6; } printf "%s\n" "#define LMOD_CONFIG_DIR \"$with_lmodConfigDir\"" >>confdefs.h -else case e in #( - e) withval="/etc/lmod" +else $as_nop + withval="/etc/lmod" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_CONFIG_DIR=$withval" >&5 printf "%s\n" "LMOD_CONFIG_DIR=$withval" >&6; } LMOD_CONFIG_DIR="$withval" printf "%s\n" "#define LMOD_CONFIG_DIR \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3750,14 +3695,13 @@ then : printf "%s\n" "AUTO_SWAP=$with_autoSwap" >&6; } printf "%s\n" "#define AUTO_SWAP \"$with_autoSwap\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AUTO_SWAP=$withval" >&5 printf "%s\n" "AUTO_SWAP=$withval" >&6; } AUTO_SWAP="$withval" printf "%s\n" "#define AUTO_SWAP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3774,14 +3718,13 @@ then : printf "%s\n" "EXPORT_MODULE=$with_exportedModuleCmd" >&6; } printf "%s\n" "#define EXPORT_MODULE \"$with_exportedModuleCmd\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXPORT_MODULE=$withval" >&5 printf "%s\n" "EXPORT_MODULE=$withval" >&6; } EXPORT_MODULE="$withval" printf "%s\n" "#define EXPORT_MODULE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3796,14 +3739,13 @@ then : printf "%s\n" "REDIRECT=$with_redirect" >&6; } printf "%s\n" "#define REDIRECT \"$with_redirect\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: REDIRECT=$withval" >&5 printf "%s\n" "REDIRECT=$withval" >&6; } REDIRECT="$withval" printf "%s\n" "#define REDIRECT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3815,14 +3757,13 @@ then : printf "%s\n" "MODULEPATH_ROOT=$with_module_root_path" >&6; } printf "%s\n" "#define MODULEPATH_ROOT \"$with_module_root_path\"" >>confdefs.h -else case e in #( - e) withval="$prefix/modulefiles" +else $as_nop + withval="$prefix/modulefiles" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_ROOT=$withval" >&5 printf "%s\n" "MODULEPATH_ROOT=$withval" >&6; } MODULEPATH_ROOT="$withval" printf "%s\n" "#define MODULEPATH_ROOT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3835,14 +3776,13 @@ then : printf "%s\n" "ANCIENT=$with_ancient" >&6; } printf "%s\n" "#define ANCIENT \"$with_ancient\"" >>confdefs.h -else case e in #( - e) withval="86400" +else $as_nop + withval="86400" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ANCIENT=$withval" >&5 printf "%s\n" "ANCIENT=$withval" >&6; } ANCIENT="$withval" printf "%s\n" "#define ANCIENT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3855,14 +3795,13 @@ then : printf "%s\n" "SHORT_TIME=$with_shortTime" >&6; } printf "%s\n" "#define SHORT_TIME \"$with_shortTime\"" >>confdefs.h -else case e in #( - e) withval="2" +else $as_nop + withval="2" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SHORT_TIME=$withval" >&5 printf "%s\n" "SHORT_TIME=$withval" >&6; } SHORT_TIME="$withval" printf "%s\n" "#define SHORT_TIME \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3875,14 +3814,13 @@ then : printf "%s\n" "SPIDER_CACHE_DIRS=$with_spiderCacheDir" >&6; } printf "%s\n" "#define SPIDER_CACHE_DIRS \"$with_spiderCacheDir\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DIRS=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DIRS=$withval" >&6; } SPIDER_CACHE_DIRS="$withval" printf "%s\n" "#define SPIDER_CACHE_DIRS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3895,14 +3833,13 @@ then : printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$with_spiderCacheDescript" >&6; } printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$with_spiderCacheDescript\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DESCRIPT_FN=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$withval" >&6; } SPIDER_CACHE_DESCRIPT_FN="$withval" printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3915,14 +3852,13 @@ then : printf "%s\n" "UPDATE_SYSTEM_FN=$with_updateSystemFn" >&6; } printf "%s\n" "#define UPDATE_SYSTEM_FN \"$with_updateSystemFn\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: UPDATE_SYSTEM_FN=$withval" >&5 printf "%s\n" "UPDATE_SYSTEM_FN=$withval" >&6; } UPDATE_SYSTEM_FN="$withval" printf "%s\n" "#define UPDATE_SYSTEM_FN \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3935,14 +3871,13 @@ then : printf "%s\n" "PREPEND_BLOCK=$with_prependBlock" >&6; } printf "%s\n" "#define PREPEND_BLOCK \"$with_prependBlock\"" >>confdefs.h -else case e in #( - e) withval="normal" +else $as_nop + withval="normal" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PREPEND_BLOCK=$withval" >&5 printf "%s\n" "PREPEND_BLOCK=$withval" >&6; } PREPEND_BLOCK="$withval" printf "%s\n" "#define PREPEND_BLOCK \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3955,14 +3890,13 @@ then : printf "%s\n" "SITE_NAME=$with_siteName" >&6; } printf "%s\n" "#define SITE_NAME \"$with_siteName\"" >>confdefs.h -else case e in #( - e) withval='' +else $as_nop + withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_NAME=$withval" >&5 printf "%s\n" "SITE_NAME=$withval" >&6; } SITE_NAME="$withval" printf "%s\n" "#define SITE_NAME \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3975,14 +3909,13 @@ then : printf "%s\n" "SYSHOST=$with_syshost" >&6; } printf "%s\n" "#define SYSHOST \"$with_syshost\"" >>confdefs.h -else case e in #( - e) withval='' +else $as_nop + withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SYSHOST=$withval" >&5 printf "%s\n" "SYSHOST=$withval" >&6; } SYSHOST="$withval" printf "%s\n" "#define SYSHOST \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3997,14 +3930,13 @@ then : printf "%s\n" "ALLOW_TCL_MFILES==$withval" >&6; } printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ALLOW_TCL_MFILES=$withval" >&5 printf "%s\n" "ALLOW_TCL_MFILES=$withval" >&6; } ALLOW_TCL_MFILES="$withval" printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4019,14 +3951,13 @@ then : printf "%s\n" "DISABLE_NAME_AUTOSWAP==$withval" >&6; } printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DISABLE_NAME_AUTOSWAP=$withval" >&5 printf "%s\n" "DISABLE_NAME_AUTOSWAP=$withval" >&6; } DISABLE_NAME_AUTOSWAP="$withval" printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4041,14 +3972,13 @@ then : printf "%s\n" "MPATH_AVAIL==$withval" >&6; } printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MPATH_AVAIL=$withval" >&5 printf "%s\n" "MPATH_AVAIL=$withval" >&6; } MPATH_AVAIL="$withval" printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4063,14 +3993,13 @@ then : printf "%s\n" "SETTARG=$with_settarg" >&6; } printf "%s\n" "#define SETTARG \"$with_settarg\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SETTARG=$withval" >&5 printf "%s\n" "SETTARG=$withval" >&6; } SETTARG="$withval" printf "%s\n" "#define SETTARG \"$withval\"" >>confdefs.h - ;; -esac + fi DFLT_IGNORE_DIRS=".svn,.git,.hg,.bzr" @@ -4085,14 +4014,13 @@ then : printf "%s\n" "IGNORE_DIRS=$with_ignoreDirs" >&6; } printf "%s\n" "#define IGNORE_DIRS \"$with_ignoreDirs\"" >>confdefs.h -else case e in #( - e) withval="$DFLT_IGNORE_DIRS" +else $as_nop + withval="$DFLT_IGNORE_DIRS" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IGNORE_DIRS=$withval" >&5 printf "%s\n" "IGNORE_DIRS=$withval" >&6; } IGNORE_DIRS="$withval" printf "%s\n" "#define IGNORE_DIRS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4107,14 +4035,13 @@ then : printf "%s\n" "PIN_VERSIONS=$with_pinVersions" >&6; } printf "%s\n" "#define PIN_VERSIONS \"$with_pinVersions\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PIN_VERSIONS=$withval" >&5 printf "%s\n" "PIN_VERSIONS=$withval" >&6; } PIN_VERSIONS="$withval" printf "%s\n" "#define PIN_VERSIONS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4129,14 +4056,13 @@ then : printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$with_downstreamConflicts" >&6; } printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$with_downstreamConflicts\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_DOWNSTREAM_CONFLICTS=$withval" >&5 printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$withval" >&6; } LMOD_DOWNSTREAM_CONFLICTS="$withval" printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4151,14 +4077,13 @@ then : printf "%s\n" "MODULES_AUTO_HANDLING=$with_modulesAutoHandling" >&6; } printf "%s\n" "#define MODULES_AUTO_HANDLING \"$with_modulesAutoHandling\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULES_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULES_AUTO_HANDLING=$withval" >&6; } MODULES_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULES_AUTO_HANDLING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4173,14 +4098,13 @@ then : printf "%s\n" "TMOD_PATH_RULE=$with_tmodPathRule" >&6; } printf "%s\n" "#define TMOD_PATH_RULE \"$with_tmodPathRule\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_PATH_RULE=$withval" >&5 printf "%s\n" "TMOD_PATH_RULE=$withval" >&6; } TMOD_PATH_RULE="$withval" printf "%s\n" "#define TMOD_PATH_RULE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4195,14 +4119,13 @@ then : printf "%s\n" "TMOD_FIND_FIRST=$with_tmodFindFirst" >&6; } printf "%s\n" "#define TMOD_FIND_FIRST \"$with_tmodFindFirst\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_FIND_FIRST=$withval" >&5 printf "%s\n" "TMOD_FIND_FIRST=$withval" >&6; } TMOD_FIND_FIRST="$withval" printf "%s\n" "#define TMOD_FIND_FIRST \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4215,14 +4138,13 @@ then : printf "%s\n" "LUA_INCLUDE=$with_lua_include" >&6; } printf "%s\n" "#define LUA_INCLUDE \"$with_lua_include\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_INCLUDE=$withval" >&5 printf "%s\n" "LUA_INCLUDE=$withval" >&6; } LUA_INCLUDE="$withval" printf "%s\n" "#define LUA_INCLUDE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4237,14 +4159,13 @@ then : printf "%s\n" "CACHED_LOADS=$with_cachedLoads" >&6; } printf "%s\n" "#define CACHED_LOADS \"$with_cachedLoads\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CACHED_LOADS=$withval" >&5 printf "%s\n" "CACHED_LOADS=$withval" >&6; } CACHED_LOADS="$withval" printf "%s\n" "#define CACHED_LOADS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4259,14 +4180,13 @@ then : printf "%s\n" "EXTENDED_DEFAULT=$with_extendedDefault" >&6; } printf "%s\n" "#define EXTENDED_DEFAULT \"$with_extendedDefault\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXTENDED_DEFAULT=$withval" >&5 printf "%s\n" "EXTENDED_DEFAULT=$withval" >&6; } EXTENDED_DEFAULT="$withval" printf "%s\n" "#define EXTENDED_DEFAULT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4281,14 +4201,13 @@ then : printf "%s\n" "SUPPORT_KSH=$with_supportKsh" >&6; } printf "%s\n" "#define SUPPORT_KSH \"$with_supportKsh\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SUPPORT_KSH=$withval" >&5 printf "%s\n" "SUPPORT_KSH=$withval" >&6; } SUPPORT_KSH="$withval" printf "%s\n" "#define SUPPORT_KSH \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4301,14 +4220,13 @@ then : printf "%s\n" "MODULEPATH_INIT=$with_ModulePathInit" >&6; } printf "%s\n" "#define MODULEPATH_INIT \"$with_ModulePathInit\"" >>confdefs.h -else case e in #( - e) withval="@PKG@/init/.modulespath" +else $as_nop + withval="@PKG@/init/.modulespath" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_INIT=$withval" >&5 printf "%s\n" "MODULEPATH_INIT=$withval" >&6; } MODULEPATH_INIT="$withval" printf "%s\n" "#define MODULEPATH_INIT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4323,14 +4241,13 @@ then : printf "%s\n" "SITE_CONTROLLED_PREFIX=$with_siteControlPrefix" >&6; } printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$with_siteControlPrefix\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_CONTROLLED_PREFIX=$withval" >&5 printf "%s\n" "SITE_CONTROLLED_PREFIX=$withval" >&6; } SITE_CONTROLLED_PREFIX="$withval" printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4345,14 +4262,13 @@ then : printf "%s\n" "USE_BUILT_IN_PKGS=$with_useBuiltinPkgs" >&6; } printf "%s\n" "#define USE_BUILT_IN_PKGS \"$with_useBuiltinPkgs\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_BUILT_IN_PKGS=$withval" >&5 printf "%s\n" "USE_BUILT_IN_PKGS=$withval" >&6; } USE_BUILT_IN_PKGS="$withval" printf "%s\n" "#define USE_BUILT_IN_PKGS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4367,14 +4283,13 @@ then : printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$with_useDotConfigDirOnly" >&6; } printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$with_useDotConfigDirOnly\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_DOT_CONFIG_DIR_ONLY=$withval" >&5 printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$withval" >&6; } USE_DOT_CONFIG_DIR_ONLY="$withval" printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4389,14 +4304,13 @@ then : printf "%s\n" "SILENCE_SHELL_DEBUGGING=$with_silentShellDebugging" >&6; } printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$with_silentShellDebugging\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SILENCE_SHELL_DEBUGGING=$withval" >&5 printf "%s\n" "SILENCE_SHELL_DEBUGGING=$withval" >&6; } SILENCE_SHELL_DEBUGGING="$withval" printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4411,14 +4325,13 @@ then : printf "%s\n" "FAST_TCL_INTERP=$with_fastTCLInterp" >&6; } printf "%s\n" "#define FAST_TCL_INTERP \"$with_fastTCLInterp\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FAST_TCL_INTERP=$withval" >&5 printf "%s\n" "FAST_TCL_INTERP=$withval" >&6; } FAST_TCL_INTERP="$withval" printf "%s\n" "#define FAST_TCL_INTERP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4433,14 +4346,13 @@ then : printf "%s\n" "MODULE_AUTO_HANDLING=$with-moduleAutoHandling" >&6; } printf "%s\n" "#define MODULE_AUTO_HANDLING \"$with-moduleAutoHandling\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULE_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULE_AUTO_HANDLING=$withval" >&6; } MODULE_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULE_AUTO_HANDLING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4455,14 +4367,13 @@ then : printf "%s\n" "AVAIL_EXTENSIONS=$with_availExtensions" >&6; } printf "%s\n" "#define AVAIL_EXTENSIONS \"$with_availExtensions\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AVAIL_EXTENSIONS=$withval" >&5 printf "%s\n" "AVAIL_EXTENSIONS=$withval" >&6; } AVAIL_EXTENSIONS="$withval" printf "%s\n" "#define AVAIL_EXTENSIONS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4479,14 +4390,13 @@ then : printf "%s\n" "PATH_TO_LUA=$with_lua" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$with_lua\"" >>confdefs.h -else case e in #( - e) withval="lua" +else $as_nop + withval="lua" PATH_TO_LUA="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$withval" >&5 printf "%s\n" "PATH_TO_LUA=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4503,14 +4413,13 @@ then : printf "%s\n" "PATH_TO_LUAC=$with_luac" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$with_luac\"" >>confdefs.h -else case e in #( - e) withval="luac" +else $as_nop + withval="luac" PATH_TO_LUAC="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$withval" >&5 printf "%s\n" "PATH_TO_LUAC=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4525,14 +4434,13 @@ then : printf "%s\n" "LUA_SUFFIX=$with_luaSuffic" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$with_luaSuffix\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" LUA_SUFFIX="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_SUFFIX=$withval" >&5 printf "%s\n" "LUA_SUFFIX=$withval" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$withval\"" >>confdefs.h - ;; -esac + fi if test "$ALLOW_TCL_MFILES" = no ; then @@ -4563,8 +4471,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $pkgConfig in +else $as_nop + case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -4590,7 +4498,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; -esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -4667,21 +4574,15 @@ printf %s "checking for library containing Tcl_CreateInterp... " >&6; } if test ${ac_cv_search_Tcl_CreateInterp+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char Tcl_CreateInterp (void); + builtin and then its argument prototype would still apply. */ +char Tcl_CreateInterp (); int main (void) { @@ -4712,13 +4613,11 @@ done if test ${ac_cv_search_Tcl_CreateInterp+y} then : -else case e in #( - e) ac_cv_search_Tcl_CreateInterp=no ;; -esac +else $as_nop + ac_cv_search_Tcl_CreateInterp=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_Tcl_CreateInterp" >&5 printf "%s\n" "$ac_cv_search_Tcl_CreateInterp" >&6; } @@ -4727,10 +4626,9 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else case e in #( - e) rm -f makefile; FOUND_ERROR=yes; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" >&5 -printf "%s\n" "$as_me: Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" >&6;} ;; -esac +else $as_nop + rm -f makefile; FOUND_ERROR=yes; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" >&5 +printf "%s\n" "$as_me: Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" >&6;} fi @@ -4784,8 +4682,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PS+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PS in +else $as_nop + case $PS in [\\/]* | ?:[\\/]*) ac_cv_path_PS="$PS" # Let the user override the test with a path. ;; @@ -4811,7 +4709,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PS" && ac_cv_path_PS="UNKNOWN_PS" ;; -esac ;; esac fi PS=$ac_cv_path_PS @@ -4839,8 +4736,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_READLINK+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $READLINK in +else $as_nop + case $READLINK in [\\/]* | ?:[\\/]*) ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path. ;; @@ -4866,7 +4763,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_READLINK" && ac_cv_path_READLINK="UNKNOWN_READLINK" ;; -esac ;; esac fi READLINK=$ac_cv_path_READLINK @@ -4896,8 +4792,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_EXPR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $EXPR in +else $as_nop + case $EXPR in [\\/]* | ?:[\\/]*) ac_cv_path_EXPR="$EXPR" # Let the user override the test with a path. ;; @@ -4922,7 +4818,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi EXPR=$ac_cv_path_EXPR @@ -4956,8 +4851,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BASENAME+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $BASENAME in +else $as_nop + case $BASENAME in [\\/]* | ?:[\\/]*) ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path. ;; @@ -4982,7 +4877,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi BASENAME=$ac_cv_path_BASENAME @@ -5016,8 +4910,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $BC in +else $as_nop + case $BC in [\\/]* | ?:[\\/]*) ac_cv_path_BC="$BC" # Let the user override the test with a path. ;; @@ -5042,7 +4936,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi BC=$ac_cv_path_BC @@ -5074,8 +4967,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_POD2MAN+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_POD2MAN in +else $as_nop + case $PATH_TO_POD2MAN in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_POD2MAN="$PATH_TO_POD2MAN" # Let the user override the test with a path. ;; @@ -5101,7 +4994,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_POD2MAN" && ac_cv_path_PATH_TO_POD2MAN="UNKNOWN_POD2MAN" ;; -esac ;; esac fi PATH_TO_POD2MAN=$ac_cv_path_PATH_TO_POD2MAN @@ -5122,8 +5014,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_GIT+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_GIT in +else $as_nop + case $PATH_TO_GIT in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_GIT="$PATH_TO_GIT" # Let the user override the test with a path. ;; @@ -5149,7 +5041,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_GIT" && ac_cv_path_PATH_TO_GIT="""" ;; -esac ;; esac fi PATH_TO_GIT=$ac_cv_path_PATH_TO_GIT @@ -5171,8 +5062,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_PAGER+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_PAGER in +else $as_nop + case $PATH_TO_PAGER in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_PAGER="$PATH_TO_PAGER" # Let the user override the test with a path. ;; @@ -5197,7 +5088,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_PAGER=$ac_cv_path_PATH_TO_PAGER @@ -5224,8 +5114,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_HASHSUM+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_HASHSUM in +else $as_nop + case $PATH_TO_HASHSUM in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_HASHSUM="$PATH_TO_HASHSUM" # Let the user override the test with a path. ;; @@ -5250,7 +5140,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_HASHSUM=$ac_cv_path_PATH_TO_HASHSUM @@ -5284,8 +5173,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TCLSH+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_TCLSH in +else $as_nop + case $PATH_TO_TCLSH in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TCLSH="$PATH_TO_TCLSH" # Let the user override the test with a path. ;; @@ -5311,7 +5200,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_TCLSH" && ac_cv_path_PATH_TO_TCLSH="UNKNOWN_TCLSH" ;; -esac ;; esac fi PATH_TO_TCLSH=$ac_cv_path_PATH_TO_TCLSH @@ -5340,8 +5228,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_TR in +else $as_nop + case $PATH_TO_TR in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TR="$PATH_TO_TR" # Let the user override the test with a path. ;; @@ -5366,7 +5254,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_TR=$ac_cv_path_PATH_TO_TR @@ -5392,8 +5279,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_LS+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_LS in +else $as_nop + case $PATH_TO_LS in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_LS="$PATH_TO_LS" # Let the user override the test with a path. ;; @@ -5418,7 +5305,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_LS=$ac_cv_path_PATH_TO_LS @@ -5484,8 +5370,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUA+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $FIND_PATH_TO_LUA in +else $as_nop + case $FIND_PATH_TO_LUA in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUA="$FIND_PATH_TO_LUA" # Let the user override the test with a path. ;; @@ -5510,7 +5396,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi FIND_PATH_TO_LUA=$ac_cv_path_FIND_PATH_TO_LUA @@ -5540,8 +5425,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUAC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $FIND_PATH_TO_LUAC in +else $as_nop + case $FIND_PATH_TO_LUAC in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUAC="$FIND_PATH_TO_LUAC" # Let the user override the test with a path. ;; @@ -5566,7 +5451,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi FIND_PATH_TO_LUAC=$ac_cv_path_FIND_PATH_TO_LUAC @@ -5713,8 +5597,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $pkgConfig in +else $as_nop + case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -5740,7 +5624,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; -esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -5804,8 +5687,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ZSH+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $ZSH in +else $as_nop + case $ZSH in [\\/]* | ?:[\\/]*) ac_cv_path_ZSH="$ZSH" # Let the user override the test with a path. ;; @@ -5830,7 +5713,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi ZSH=$ac_cv_path_ZSH @@ -5887,8 +5769,8 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# 'ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* 'ac_cv_foo' will be assigned the +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. _ACEOF @@ -5918,14 +5800,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # 'set' does not quote correctly, so add quotes: double-quote + # `set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # 'set' quotes correctly as required by POSIX, so do not add quotes. + # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -5989,7 +5871,9 @@ s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g t quote b any :quote -s/[][ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g s/\$/$$/g H :any @@ -6049,6 +5933,7 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -6057,13 +5942,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else case e in #( - e) case `(set -o) 2>/dev/null` in #( +else $as_nop + case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi @@ -6135,7 +6019,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as 'sh COMMAND' +# We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -6164,6 +6048,7 @@ as_fn_error () } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -6203,12 +6088,11 @@ then : { eval $1+=\$2 }' -else case e in #( - e) as_fn_append () +else $as_nop + as_fn_append () { eval $1=\$$1\$2 - } ;; -esac + } fi # as_fn_append # as_fn_arith ARG... @@ -6222,12 +6106,11 @@ then : { as_val=$(( $* )) }' -else case e in #( - e) as_fn_arith () +else $as_nop + as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } ;; -esac + } fi # as_fn_arith @@ -6310,9 +6193,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. - # In both cases, we have to default to 'cp -pR'. + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -6393,12 +6276,10 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -as_tr_sh="eval sed '$as_sed_sh'" # deprecated +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" exec 6>&1 @@ -6414,7 +6295,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.72. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6441,7 +6322,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -'$as_me' instantiates files and other configuration actions +\`$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -6469,10 +6350,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.72, +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2023 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -6529,8 +6410,8 @@ do ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: '$1' -Try '$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -6580,7 +6461,7 @@ do case $ac_config_target in "makefile") CONFIG_FILES="$CONFIG_FILES makefile:Makefile.in" ;; - *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -6598,7 +6479,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to '$tmp'. +# after its creation but before its name has been assigned to `$tmp'. $debug || { tmp= ac_tmp= @@ -6622,7 +6503,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with './config.status config.h'. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -6788,7 +6669,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6810,19 +6691,19 @@ do -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain ':'. + # because $ac_f cannot contain `:'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is 'configure' which instantiates (i.e., don't + # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` @@ -6946,7 +6827,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when '$srcdir' = '.'. +# Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -6975,9 +6856,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" From 96821704fa51a87464d94e338310f489566dfb89 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Wed, 31 Jul 2024 17:29:14 -0500 Subject: [PATCH 040/198] more configure foo testing --- configure | 60 +++++++++++++++++++++++++++++++++++----------------- configure.ac | 54 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 79 insertions(+), 35 deletions(-) diff --git a/configure b/configure index 3a0d809bf..d6513e223 100755 --- a/configure +++ b/configure @@ -3458,6 +3458,8 @@ FOLLOW_READLINK () echo $myprog } +ERR_MSG="" +FOUND_ERROR= @@ -4383,8 +4385,9 @@ if test ${with_lua+y} then : withval=$with_lua; PATH_TO_LUA="$withval" if test ${PATH_TO_LUA:0:1} != '/' ; then - echo "Path to lua must be absolute" - FOUND_ERROR=yes + echo + echo "ERROR: Path to lua must be absolute!" + exit 1 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$with_lua" >&5 printf "%s\n" "PATH_TO_LUA=$with_lua" >&6; } @@ -4406,8 +4409,9 @@ if test ${with_luac+y} then : withval=$with_luac; PATH_TO_LUAC="$withval" if test ${PATH_TO_LUAC:0:1} != '/' ; then - echo "Path to luac must be absolute" - FOUND_ERROR=yes + echo + echo "ERROR: Path to luac must be absolute" + exit 1 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$with_luac" >&5 printf "%s\n" "PATH_TO_LUAC=$with_luac" >&6; } @@ -4447,8 +4451,6 @@ if test "$ALLOW_TCL_MFILES" = no ; then FAST_TCL_INTERP=no fi -FOUND_ERROR= - if test "$FAST_TCL_INTERP" = yes ; then OS=$(uname -s) if test "$OS" = Darwin ; then @@ -4456,7 +4458,7 @@ if test "$FAST_TCL_INTERP" = yes ; then TCL_INCLUDE="-I${DIR}/usr/include" else for i in "" tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do - if test -f /usr/include/$i/tcl.h ; then + if test -f /usr/include/$i/tcl.hh ; then TCL_INCLUDE="-I/usr/include/$i" break; fi @@ -4464,8 +4466,8 @@ if test "$FAST_TCL_INTERP" = yes ; then fi if test -z "$TCL_INCLUDE" ; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + # Extract the first word of "pkg-configFoo", so it can be a program name with args. +set dummy pkg-configFoo; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} @@ -4554,8 +4556,8 @@ then : printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default" -if test "x$ac_cv_header_tcl_h" = xyes +ac_fn_c_check_header_compile "$LINENO" "tcl.hh" "ac_cv_header_tcl_hh" "$ac_includes_default" +if test "x$ac_cv_header_tcl_hh" = xyes then : printf "%s\n" "#define HAVE_TCL_H 1" >>confdefs.h @@ -4566,8 +4568,10 @@ fi if test "$ac_cv_header_tcl_h" != yes ; then rm -f makefile FOUND_ERROR=yes - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" >&5 -printf "%s\n" "$as_me: Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" >&6;} + MSG="Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" + ERR_MSG="$ERR_MSG||$MSG" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $MSG" >&5 +printf "%s\n" "$as_me: $MSG" >&6;} fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing Tcl_CreateInterp" >&5 printf %s "checking for library containing Tcl_CreateInterp... " >&6; } @@ -4661,14 +4665,25 @@ PATH_TO_SRC=$SRCDIR -if test $MODE != "user_default" ; then - mode=0$MODE +FOUND_ERROR=yes +MSG="MODE must have at least one executable bit set (Not MODE=$MODE)| +Please try setting mode to 755 or 750 or 700 or similar." + + echo "$MSG" + echo +ERR_MSG="$ERR_MSG||$MSG" + +if test $MODE == "user_default" ; then + mode=0755 EXEC_BITS=$(( 0111 & $mode )); if test $EXEC_BITS = 0; then +MSG="MODE must have at least one executable bit set (Not MODE=$MODE) +Please try setting mode to 755 or 750 or 700 or similar." + + echo "$MSG" echo - echo "MODE must have at least one executable bit set (Not MODE=$MODE)" - echo "Please try setting mode to 755 or 750 or 700 or similar." - echo +ERR_MSG="$ERR_MSG +$MSG" rm -f makefile FOUND_ERROR=yes fi @@ -5673,8 +5688,15 @@ fi if test $FOUND_ERROR = yes; then echo - echo One or more errors found -> Quiting! + echo One or more errors found: echo + echo Error Messages: + echo "------------------------------------------------------------" + echo $ERR_MSG | tr '|' '\n' | while read item; do + echo $item + done + echo "------------------------------------------------------------" + rm -f makefile exit 1; fi diff --git a/configure.ac b/configure.ac index cfe0a3ed5..c73e77b47 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,8 @@ FOLLOW_READLINK () echo $myprog } +ERR_MSG="" +FOUND_ERROR= AC_SUBST(DUPLICATE_PATHS) AC_ARG_WITH(duplicatePaths, @@ -651,8 +653,9 @@ AC_ARG_WITH(lua, AS_HELP_STRING([--with-lua=ans],[absolute path to the lua interpreter to use [[lua]]]), PATH_TO_LUA="$withval" if test ${PATH_TO_LUA:0:1} != '/' ; then - echo "Path to lua must be absolute" - FOUND_ERROR=yes + echo + echo "ERROR: Path to lua must be absolute!" + exit 1 fi AC_MSG_RESULT([PATH_TO_LUA=$with_lua]) AC_DEFINE_UNQUOTED(PATH_TO_LUA, "$with_lua")dnl @@ -667,8 +670,9 @@ AC_ARG_WITH(luac, AS_HELP_STRING([--with-luac=ans],[absolute path to the luac interpreter to use [[luac]]]), PATH_TO_LUAC="$withval" if test ${PATH_TO_LUAC:0:1} != '/' ; then - echo "Path to luac must be absolute" - FOUND_ERROR=yes + echo + echo "ERROR: Path to luac must be absolute" + exit 1 fi AC_MSG_RESULT([PATH_TO_LUAC=$with_luac]) AC_DEFINE_UNQUOTED(PATH_TO_LUAC, "$with_luac")dnl @@ -696,8 +700,6 @@ if test "$ALLOW_TCL_MFILES" = no ; then FAST_TCL_INTERP=no fi -FOUND_ERROR= - if test "$FAST_TCL_INTERP" = yes ; then OS=$(uname -s) if test "$OS" = Darwin ; then @@ -705,7 +707,7 @@ if test "$FAST_TCL_INTERP" = yes ; then TCL_INCLUDE="-I${DIR}/usr/include" else for i in "" tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do - if test -f /usr/include/$i/tcl.h ; then + if test -f /usr/include/$i/tcl.hh ; then TCL_INCLUDE="-I/usr/include/$i" break; fi @@ -713,7 +715,7 @@ if test "$FAST_TCL_INTERP" = yes ; then fi if test -z "$TCL_INCLUDE" ; then - AC_PATH_PROG(pkgConfig, pkg-config, "") + AC_PATH_PROG(pkgConfig, pkg-configFoo, "") if ! test x$pkgConfig = "x"; then for i in tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do $pkgConfig --exists $i @@ -728,13 +730,15 @@ if test "$FAST_TCL_INTERP" = yes ; then CPPFLAGS="$TCL_INCLUDE" - AC_CHECK_HEADER(tcl.h, + AC_CHECK_HEADER(tcl.hh, [AC_DEFINE([HAVE_TCL_H], 1, [Define to 1 if you have tcl.h])],[]) if test "$ac_cv_header_tcl_h" != yes ; then rm -f makefile FOUND_ERROR=yes - AC_MSG_NOTICE([Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h]) + MSG="Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" + ERR_MSG="$ERR_MSG||$MSG" + AC_MSG_NOTICE([$MSG]) fi AC_SEARCH_LIBS(Tcl_CreateInterp, [tcl] [tcl8.8] [tcl8.7] [tcl8.6] [tcl8.5],[], [rm -f makefile; FOUND_ERROR=yes; AC_MSG_NOTICE([Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library])], [$TCL_LIBS]) @@ -766,14 +770,25 @@ AC_SUBST(PATH_TO_HASHSUM) AC_SUBST(PATH_TO_PAGER) AC_SUBST(PATH_TO_TCLSH) -if test $MODE != "user_default" ; then - mode=0$MODE +FOUND_ERROR=yes +MSG="MODE must have at least one executable bit set (Not MODE=$MODE)| +Please try setting mode to 755 or 750 or 700 or similar." + + echo "$MSG" + echo +ERR_MSG="$ERR_MSG||$MSG" + +if test $MODE == "user_default" ; then + mode=0755 EXEC_BITS=$(( 0111 & $mode )); if test $EXEC_BITS = 0; then +MSG="MODE must have at least one executable bit set (Not MODE=$MODE) +Please try setting mode to 755 or 750 or 700 or similar." + + echo "$MSG" echo - echo "MODE must have at least one executable bit set (Not MODE=$MODE)" - echo "Please try setting mode to 755 or 750 or 700 or similar." - echo +ERR_MSG="$ERR_MSG +$MSG" rm -f makefile FOUND_ERROR=yes fi @@ -1066,8 +1081,15 @@ fi if test $FOUND_ERROR = yes; then echo - echo One or more errors found -> Quiting! + echo One or more errors found: echo + echo Error Messages: + echo "------------------------------------------------------------" + echo $ERR_MSG | tr '|' '\n' | while read item; do + echo $item + done + echo "------------------------------------------------------------" + rm -f makefile exit 1; fi From c45dbb306f84a5de22ccb3e5e4308ecbe796b26a Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Wed, 31 Jul 2024 18:10:25 -0500 Subject: [PATCH 041/198] Better configure error handling --- configure | 59 ++++++++++++++++++++++++++++++++++++++++------------ configure.ac | 54 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 89 insertions(+), 24 deletions(-) diff --git a/configure b/configure index 4adc9c2ca..cf9e5c24b 100755 --- a/configure +++ b/configure @@ -3460,6 +3460,8 @@ FOLLOW_READLINK () echo $myprog } +ERR_MSG="" +FOUND_ERROR= @@ -4385,7 +4387,8 @@ if test ${with_lua+y} then : withval=$with_lua; PATH_TO_LUA="$withval" if test ${PATH_TO_LUA:0:1} != '/' ; then - echo "Path to lua must be absolute" + echo + echo "ERROR: Path to lua must be absolute!" exit 1 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$with_lua" >&5 @@ -4408,7 +4411,8 @@ if test ${with_luac+y} then : withval=$with_luac; PATH_TO_LUAC="$withval" if test ${PATH_TO_LUAC:0:1} != '/' ; then - echo "Path to luac must be absolute" + echo + echo "ERROR: Path to luac must be absolute" exit 1 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$with_luac" >&5 @@ -4456,7 +4460,7 @@ if test "$FAST_TCL_INTERP" = yes ; then TCL_INCLUDE="-I${DIR}/usr/include" else for i in "" tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do - if test -f /usr/include/$i/tcl.h ; then + if test -f /usr/include/$i/tcl.hh ; then TCL_INCLUDE="-I/usr/include/$i" break; fi @@ -4464,8 +4468,8 @@ if test "$FAST_TCL_INTERP" = yes ; then fi if test -z "$TCL_INCLUDE" ; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + # Extract the first word of "pkg-configFoo", so it can be a program name with args. +set dummy pkg-configFoo; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} @@ -4554,8 +4558,8 @@ then : printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default" -if test "x$ac_cv_header_tcl_h" = xyes +ac_fn_c_check_header_compile "$LINENO" "tcl.hh" "ac_cv_header_tcl_hh" "$ac_includes_default" +if test "x$ac_cv_header_tcl_hh" = xyes then : printf "%s\n" "#define HAVE_TCL_H 1" >>confdefs.h @@ -4565,7 +4569,11 @@ fi if test "$ac_cv_header_tcl_h" != yes ; then rm -f makefile - as_fn_error $? "Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" "$LINENO" 5 + FOUND_ERROR=yes + MSG="Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" + ERR_MSG="$ERR_MSG||$MSG" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $MSG" >&5 +printf "%s\n" "$as_me: $MSG" >&6;} fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing Tcl_CreateInterp" >&5 printf %s "checking for library containing Tcl_CreateInterp... " >&6; } @@ -4658,14 +4666,25 @@ PATH_TO_SRC=$SRCDIR -if test $MODE != "user_default" ; then - mode=0$MODE +FOUND_ERROR=yes +MSG="MODE must have at least one executable bit set (Not MODE=$MODE)| +Please try setting mode to 755 or 750 or 700 or similar." + + echo "$MSG" + echo +ERR_MSG="$ERR_MSG||$MSG" + +if test $MODE == "user_default" ; then + mode=0755 EXEC_BITS=$(( 0111 & $mode )); if test $EXEC_BITS = 0; then +MSG="MODE must have at least one executable bit set (Not MODE=$MODE) +Please try setting mode to 755 or 750 or 700 or similar." + + echo "$MSG" echo - echo "MODE must have at least one executable bit set (Not MODE=$MODE)" - echo "Please try setting mode to 755 or 750 or 700 or similar." - echo +ERR_MSG="$ERR_MSG +$MSG" rm -f makefile exit 1 fi @@ -5667,6 +5686,20 @@ fi ##### LUA configuration -- end +if test $FOUND_ERROR = yes; then + echo + echo One or more errors found: + echo + echo Error Messages: + echo "------------------------------------------------------------" + echo $ERR_MSG | tr '|' '\n' | while read item; do + echo $item + done + echo "------------------------------------------------------------" + + rm -f makefile + exit 1; +fi # Extract the first word of "zsh", so it can be a program name with args. diff --git a/configure.ac b/configure.ac index e55bf3682..0e0707848 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,8 @@ FOLLOW_READLINK () echo $myprog } +ERR_MSG="" +FOUND_ERROR= AC_SUBST(DUPLICATE_PATHS) AC_ARG_WITH(duplicatePaths, @@ -651,7 +653,8 @@ AC_ARG_WITH(lua, AS_HELP_STRING([--with-lua=ans],[absolute path to the lua interpreter to use [[lua]]]), PATH_TO_LUA="$withval" if test ${PATH_TO_LUA:0:1} != '/' ; then - echo "Path to lua must be absolute" + echo + echo "ERROR: Path to lua must be absolute!" exit 1 fi AC_MSG_RESULT([PATH_TO_LUA=$with_lua]) @@ -667,7 +670,8 @@ AC_ARG_WITH(luac, AS_HELP_STRING([--with-luac=ans],[absolute path to the luac interpreter to use [[luac]]]), PATH_TO_LUAC="$withval" if test ${PATH_TO_LUAC:0:1} != '/' ; then - echo "Path to luac must be absolute" + echo + echo "ERROR: Path to luac must be absolute" exit 1 fi AC_MSG_RESULT([PATH_TO_LUAC=$with_luac]) @@ -703,7 +707,7 @@ if test "$FAST_TCL_INTERP" = yes ; then TCL_INCLUDE="-I${DIR}/usr/include" else for i in "" tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do - if test -f /usr/include/$i/tcl.h ; then + if test -f /usr/include/$i/tcl.hh ; then TCL_INCLUDE="-I/usr/include/$i" break; fi @@ -711,7 +715,7 @@ if test "$FAST_TCL_INTERP" = yes ; then fi if test -z "$TCL_INCLUDE" ; then - AC_PATH_PROG(pkgConfig, pkg-config, "") + AC_PATH_PROG(pkgConfig, pkg-configFoo, "") if ! test x$pkgConfig = "x"; then for i in tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do $pkgConfig --exists $i @@ -726,12 +730,15 @@ if test "$FAST_TCL_INTERP" = yes ; then CPPFLAGS="$TCL_INCLUDE" - AC_CHECK_HEADER(tcl.h, + AC_CHECK_HEADER(tcl.hh, [AC_DEFINE([HAVE_TCL_H], 1, [Define to 1 if you have tcl.h])],[]) if test "$ac_cv_header_tcl_h" != yes ; then rm -f makefile - AC_MSG_ERROR([Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h]) + FOUND_ERROR=yes + MSG="Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" + ERR_MSG="$ERR_MSG||$MSG" + AC_MSG_NOTICE([$MSG]) fi AC_SEARCH_LIBS(Tcl_CreateInterp, [tcl] [tcl8.8] [tcl8.7] [tcl8.6] [tcl8.5],[], [rm -f makefile; AC_MSG_ERROR([Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library])], [$TCL_LIBS]) @@ -763,14 +770,25 @@ AC_SUBST(PATH_TO_HASHSUM) AC_SUBST(PATH_TO_PAGER) AC_SUBST(PATH_TO_TCLSH) -if test $MODE != "user_default" ; then - mode=0$MODE +FOUND_ERROR=yes +MSG="MODE must have at least one executable bit set (Not MODE=$MODE)| +Please try setting mode to 755 or 750 or 700 or similar." + + echo "$MSG" + echo +ERR_MSG="$ERR_MSG||$MSG" + +if test $MODE == "user_default" ; then + mode=0755 EXEC_BITS=$(( 0111 & $mode )); if test $EXEC_BITS = 0; then +MSG="MODE must have at least one executable bit set (Not MODE=$MODE) +Please try setting mode to 755 or 750 or 700 or similar." + + echo "$MSG" echo - echo "MODE must have at least one executable bit set (Not MODE=$MODE)" - echo "Please try setting mode to 755 or 750 or 700 or similar." - echo +ERR_MSG="$ERR_MSG +$MSG" rm -f makefile exit 1 fi @@ -1060,6 +1078,20 @@ fi ##### LUA configuration -- end +if test $FOUND_ERROR = yes; then + echo + echo One or more errors found: + echo + echo Error Messages: + echo "------------------------------------------------------------" + echo $ERR_MSG | tr '|' '\n' | while read item; do + echo $item + done + echo "------------------------------------------------------------" + + rm -f makefile + exit 1; +fi AC_SUBST(ZSH_SITE_FUNCTIONS_DIRS) AC_PATH_PROG(ZSH, zsh) From be28fa68d0f096e03f131da028d7df798e1130c8 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Wed, 31 Jul 2024 18:11:07 -0500 Subject: [PATCH 042/198] Better configure error handling --- configure | 59 ++++++++++++++++++++++++++++++++++++++++------------ configure.ac | 54 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 89 insertions(+), 24 deletions(-) diff --git a/configure b/configure index 4adc9c2ca..cf9e5c24b 100755 --- a/configure +++ b/configure @@ -3460,6 +3460,8 @@ FOLLOW_READLINK () echo $myprog } +ERR_MSG="" +FOUND_ERROR= @@ -4385,7 +4387,8 @@ if test ${with_lua+y} then : withval=$with_lua; PATH_TO_LUA="$withval" if test ${PATH_TO_LUA:0:1} != '/' ; then - echo "Path to lua must be absolute" + echo + echo "ERROR: Path to lua must be absolute!" exit 1 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$with_lua" >&5 @@ -4408,7 +4411,8 @@ if test ${with_luac+y} then : withval=$with_luac; PATH_TO_LUAC="$withval" if test ${PATH_TO_LUAC:0:1} != '/' ; then - echo "Path to luac must be absolute" + echo + echo "ERROR: Path to luac must be absolute" exit 1 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$with_luac" >&5 @@ -4456,7 +4460,7 @@ if test "$FAST_TCL_INTERP" = yes ; then TCL_INCLUDE="-I${DIR}/usr/include" else for i in "" tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do - if test -f /usr/include/$i/tcl.h ; then + if test -f /usr/include/$i/tcl.hh ; then TCL_INCLUDE="-I/usr/include/$i" break; fi @@ -4464,8 +4468,8 @@ if test "$FAST_TCL_INTERP" = yes ; then fi if test -z "$TCL_INCLUDE" ; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 + # Extract the first word of "pkg-configFoo", so it can be a program name with args. +set dummy pkg-configFoo; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} @@ -4554,8 +4558,8 @@ then : printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default" -if test "x$ac_cv_header_tcl_h" = xyes +ac_fn_c_check_header_compile "$LINENO" "tcl.hh" "ac_cv_header_tcl_hh" "$ac_includes_default" +if test "x$ac_cv_header_tcl_hh" = xyes then : printf "%s\n" "#define HAVE_TCL_H 1" >>confdefs.h @@ -4565,7 +4569,11 @@ fi if test "$ac_cv_header_tcl_h" != yes ; then rm -f makefile - as_fn_error $? "Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" "$LINENO" 5 + FOUND_ERROR=yes + MSG="Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" + ERR_MSG="$ERR_MSG||$MSG" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $MSG" >&5 +printf "%s\n" "$as_me: $MSG" >&6;} fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing Tcl_CreateInterp" >&5 printf %s "checking for library containing Tcl_CreateInterp... " >&6; } @@ -4658,14 +4666,25 @@ PATH_TO_SRC=$SRCDIR -if test $MODE != "user_default" ; then - mode=0$MODE +FOUND_ERROR=yes +MSG="MODE must have at least one executable bit set (Not MODE=$MODE)| +Please try setting mode to 755 or 750 or 700 or similar." + + echo "$MSG" + echo +ERR_MSG="$ERR_MSG||$MSG" + +if test $MODE == "user_default" ; then + mode=0755 EXEC_BITS=$(( 0111 & $mode )); if test $EXEC_BITS = 0; then +MSG="MODE must have at least one executable bit set (Not MODE=$MODE) +Please try setting mode to 755 or 750 or 700 or similar." + + echo "$MSG" echo - echo "MODE must have at least one executable bit set (Not MODE=$MODE)" - echo "Please try setting mode to 755 or 750 or 700 or similar." - echo +ERR_MSG="$ERR_MSG +$MSG" rm -f makefile exit 1 fi @@ -5667,6 +5686,20 @@ fi ##### LUA configuration -- end +if test $FOUND_ERROR = yes; then + echo + echo One or more errors found: + echo + echo Error Messages: + echo "------------------------------------------------------------" + echo $ERR_MSG | tr '|' '\n' | while read item; do + echo $item + done + echo "------------------------------------------------------------" + + rm -f makefile + exit 1; +fi # Extract the first word of "zsh", so it can be a program name with args. diff --git a/configure.ac b/configure.ac index e55bf3682..0e0707848 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,8 @@ FOLLOW_READLINK () echo $myprog } +ERR_MSG="" +FOUND_ERROR= AC_SUBST(DUPLICATE_PATHS) AC_ARG_WITH(duplicatePaths, @@ -651,7 +653,8 @@ AC_ARG_WITH(lua, AS_HELP_STRING([--with-lua=ans],[absolute path to the lua interpreter to use [[lua]]]), PATH_TO_LUA="$withval" if test ${PATH_TO_LUA:0:1} != '/' ; then - echo "Path to lua must be absolute" + echo + echo "ERROR: Path to lua must be absolute!" exit 1 fi AC_MSG_RESULT([PATH_TO_LUA=$with_lua]) @@ -667,7 +670,8 @@ AC_ARG_WITH(luac, AS_HELP_STRING([--with-luac=ans],[absolute path to the luac interpreter to use [[luac]]]), PATH_TO_LUAC="$withval" if test ${PATH_TO_LUAC:0:1} != '/' ; then - echo "Path to luac must be absolute" + echo + echo "ERROR: Path to luac must be absolute" exit 1 fi AC_MSG_RESULT([PATH_TO_LUAC=$with_luac]) @@ -703,7 +707,7 @@ if test "$FAST_TCL_INTERP" = yes ; then TCL_INCLUDE="-I${DIR}/usr/include" else for i in "" tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do - if test -f /usr/include/$i/tcl.h ; then + if test -f /usr/include/$i/tcl.hh ; then TCL_INCLUDE="-I/usr/include/$i" break; fi @@ -711,7 +715,7 @@ if test "$FAST_TCL_INTERP" = yes ; then fi if test -z "$TCL_INCLUDE" ; then - AC_PATH_PROG(pkgConfig, pkg-config, "") + AC_PATH_PROG(pkgConfig, pkg-configFoo, "") if ! test x$pkgConfig = "x"; then for i in tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do $pkgConfig --exists $i @@ -726,12 +730,15 @@ if test "$FAST_TCL_INTERP" = yes ; then CPPFLAGS="$TCL_INCLUDE" - AC_CHECK_HEADER(tcl.h, + AC_CHECK_HEADER(tcl.hh, [AC_DEFINE([HAVE_TCL_H], 1, [Define to 1 if you have tcl.h])],[]) if test "$ac_cv_header_tcl_h" != yes ; then rm -f makefile - AC_MSG_ERROR([Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h]) + FOUND_ERROR=yes + MSG="Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" + ERR_MSG="$ERR_MSG||$MSG" + AC_MSG_NOTICE([$MSG]) fi AC_SEARCH_LIBS(Tcl_CreateInterp, [tcl] [tcl8.8] [tcl8.7] [tcl8.6] [tcl8.5],[], [rm -f makefile; AC_MSG_ERROR([Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library])], [$TCL_LIBS]) @@ -763,14 +770,25 @@ AC_SUBST(PATH_TO_HASHSUM) AC_SUBST(PATH_TO_PAGER) AC_SUBST(PATH_TO_TCLSH) -if test $MODE != "user_default" ; then - mode=0$MODE +FOUND_ERROR=yes +MSG="MODE must have at least one executable bit set (Not MODE=$MODE)| +Please try setting mode to 755 or 750 or 700 or similar." + + echo "$MSG" + echo +ERR_MSG="$ERR_MSG||$MSG" + +if test $MODE == "user_default" ; then + mode=0755 EXEC_BITS=$(( 0111 & $mode )); if test $EXEC_BITS = 0; then +MSG="MODE must have at least one executable bit set (Not MODE=$MODE) +Please try setting mode to 755 or 750 or 700 or similar." + + echo "$MSG" echo - echo "MODE must have at least one executable bit set (Not MODE=$MODE)" - echo "Please try setting mode to 755 or 750 or 700 or similar." - echo +ERR_MSG="$ERR_MSG +$MSG" rm -f makefile exit 1 fi @@ -1060,6 +1078,20 @@ fi ##### LUA configuration -- end +if test $FOUND_ERROR = yes; then + echo + echo One or more errors found: + echo + echo Error Messages: + echo "------------------------------------------------------------" + echo $ERR_MSG | tr '|' '\n' | while read item; do + echo $item + done + echo "------------------------------------------------------------" + + rm -f makefile + exit 1; +fi AC_SUBST(ZSH_SITE_FUNCTIONS_DIRS) AC_PATH_PROG(ZSH, zsh) From 4f551bdcb636a13c1bc1bddeb2c2e786451621af Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Wed, 31 Jul 2024 18:12:54 -0500 Subject: [PATCH 043/198] Better configure error handling --- README.new | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.new b/README.new index 4fe830285..248567aef 100644 --- a/README.new +++ b/README.new @@ -162,3 +162,7 @@ Lmod 8.7+ * Issue #714: Adding "=encoding UTF-8" to pod generation (8.7.46) * Issue #716: Must only add KSH_SUPPORT to zsh when both $orig_zsh_version and $zsh_fpath have non-null values (8.7.47) * Issue #716: Use correct shell foo +W.I.P: + (8.7.48) * Collect configure error to end of configure. + + From b75344891ff2802f2d0db3d31e866e1440a59df9 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Wed, 31 Jul 2024 18:20:10 -0500 Subject: [PATCH 044/198] Better configure error handling --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index cf9e5c24b..fbf0d484a 100755 --- a/configure +++ b/configure @@ -5686,7 +5686,7 @@ fi ##### LUA configuration -- end -if test $FOUND_ERROR = yes; then +if test "$FOUND_ERROR" = yes; then echo echo One or more errors found: echo diff --git a/configure.ac b/configure.ac index 0e0707848..164a0e0bb 100644 --- a/configure.ac +++ b/configure.ac @@ -1078,7 +1078,7 @@ fi ##### LUA configuration -- end -if test $FOUND_ERROR = yes; then +if test "$FOUND_ERROR" = yes; then echo echo One or more errors found: echo From e26cd1fc59befb69bddaab04885548215ce4590a Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Wed, 31 Jul 2024 18:20:44 -0500 Subject: [PATCH 045/198] Better configure error handling --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index cf9e5c24b..fbf0d484a 100755 --- a/configure +++ b/configure @@ -5686,7 +5686,7 @@ fi ##### LUA configuration -- end -if test $FOUND_ERROR = yes; then +if test "$FOUND_ERROR" = yes; then echo echo One or more errors found: echo diff --git a/configure.ac b/configure.ac index 0e0707848..164a0e0bb 100644 --- a/configure.ac +++ b/configure.ac @@ -1078,7 +1078,7 @@ fi ##### LUA configuration -- end -if test $FOUND_ERROR = yes; then +if test "$FOUND_ERROR" = yes; then echo echo One or more errors found: echo From 679008c99e702f4d503a1067476a90b8f0c09e97 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Wed, 31 Jul 2024 18:20:54 -0500 Subject: [PATCH 046/198] Better configure error handling --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index cf9e5c24b..fbf0d484a 100755 --- a/configure +++ b/configure @@ -5686,7 +5686,7 @@ fi ##### LUA configuration -- end -if test $FOUND_ERROR = yes; then +if test "$FOUND_ERROR" = yes; then echo echo One or more errors found: echo diff --git a/configure.ac b/configure.ac index 0e0707848..164a0e0bb 100644 --- a/configure.ac +++ b/configure.ac @@ -1078,7 +1078,7 @@ fi ##### LUA configuration -- end -if test $FOUND_ERROR = yes; then +if test "$FOUND_ERROR" = yes; then echo echo One or more errors found: echo From f6ade7d309e43b65685d320e3a63ee0aee2dfd18 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 1 Aug 2024 08:51:06 -0500 Subject: [PATCH 047/198] update configure to report all errors before quiting --- configure | 995 ++++++++++++++++++++++++++++----------------------- configure.ac | 10 +- 2 files changed, 554 insertions(+), 451 deletions(-) diff --git a/configure b/configure index fbf0d484a..32ad3975c 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71. +# Generated by GNU Autoconf 2.72. # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, # Inc. # # @@ -15,7 +15,6 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -24,12 +23,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi @@ -101,7 +101,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -131,15 +131,14 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. +# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh NULLCMD=: @@ -147,12 +146,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else \$as_nop - case \`(set -o) 2>/dev/null\` in #( +else case e in #( + e) case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi " @@ -170,8 +170,9 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : -else \$as_nop - exitcode=1; echo positional parameters were not saved. +else case e in #( + e) exitcode=1; echo positional parameters were not saved. ;; +esac fi test x\$exitcode = x0 || exit 1 blah=\$(echo \$(echo blah)) @@ -184,14 +185,15 @@ test -x / || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes -else $as_nop - as_have_required=no +else case e in #( + e) as_have_required=no ;; +esac fi if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null then : -else $as_nop - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do @@ -224,12 +226,13 @@ IFS=$as_save_IFS if $as_found then : -else $as_nop - if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +else case e in #( + e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null then : CONFIG_SHELL=$SHELL as_have_required=yes -fi +fi ;; +esac fi @@ -251,7 +254,7 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. +# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -270,7 +273,8 @@ $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." fi exit 1 -fi +fi ;; +esac fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -309,14 +313,6 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -385,11 +381,12 @@ then : { eval $1+=\$2 }' -else $as_nop - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -403,21 +400,14 @@ then : { as_val=$(( $* )) }' -else $as_nop - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -491,6 +481,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' + t clear + :clear s/[$]LINENO.*/&-/ t lineno b @@ -539,7 +531,6 @@ esac as_echo='printf %s\n' as_echo_n='printf %s' - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -551,9 +542,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -578,10 +569,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated test -n "$DJDIR" || exec 7<&0 /dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -964,7 +957,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1177,7 +1170,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1193,7 +1186,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1223,8 +1216,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: '$ac_option' +Try '$0 --help' for more information" ;; *=*) @@ -1232,7 +1225,7 @@ Try \`$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: '$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1282,7 +1275,7 @@ do as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: `$host' +# There might be people who depend on the old broken behavior: '$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -1350,7 +1343,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -1378,7 +1371,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +'configure' configures this package to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1392,11 +1385,11 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages + -q, --quiet, --silent do not print 'checking ...' messages --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' + -C, --config-cache alias for '--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] + --srcdir=DIR find the sources in DIR [configure dir or '..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1404,10 +1397,10 @@ Installation directories: --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. +By default, 'make install' will install all the files in +'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify +an installation prefix other than '$ac_default_prefix' using '--prefix', +for instance '--prefix=\$HOME'. For better control, use the options below. @@ -1546,7 +1539,7 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory -Use these variables to override the choices made by `configure' or to help +Use these variables to override the choices made by 'configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to the package provider. @@ -1614,9 +1607,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.71 +generated by GNU Autoconf 2.72 -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1655,11 +1648,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1678,8 +1672,8 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> @@ -1687,10 +1681,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -1730,11 +1726,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -1770,7 +1767,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.71. Invocation command line was +generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -2016,10 +2013,10 @@ esac printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } fi done @@ -2055,9 +2052,7 @@ struct stat; /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; +static char *e (char **p, int i) { return p[i]; } @@ -2071,6 +2066,21 @@ static char *f (char * (*g) (char **, int), char **p, ...) return s; } +/* C89 style stringification. */ +#define noexpand_stringify(a) #a +const char *stringified = noexpand_stringify(arbitrary+token=sequence); + +/* C89 style token pasting. Exercises some of the corner cases that + e.g. old MSVC gets wrong, but not very hard. */ +#define noexpand_concat(a,b) a##b +#define expand_concat(a,b) noexpand_concat(a,b) +extern int vA; +extern int vbee; +#define aye A +#define bee B +int *pvA = &expand_concat(v,aye); +int *pvbee = &noexpand_concat(v,bee); + /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not \xHH hex character constants. These do not provoke an error unfortunately, instead are silently treated @@ -2098,16 +2108,19 @@ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); # Test code for whether the C compiler supports C99 (global declarations) ac_c_conftest_c99_globals=' -// Does the compiler advertise C99 conformance? +/* Does the compiler advertise C99 conformance? */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L # error "Compiler does not advertise C99 conformance" #endif +// See if C++-style comments work. + #include extern int puts (const char *); extern int printf (const char *, ...); extern int dprintf (int, const char *, ...); extern void *malloc (size_t); +extern void free (void *); // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare @@ -2157,7 +2170,6 @@ typedef const char *ccp; static inline int test_restrict (ccp restrict text) { - // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) @@ -2223,6 +2235,8 @@ ac_c_conftest_c99_main=' ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; + // Work around memory leak warnings. + free (ia); // Check named initializers. struct named_init ni = { @@ -2244,7 +2258,7 @@ ac_c_conftest_c99_main=' # Test code for whether the C compiler supports C11 (global declarations) ac_c_conftest_c11_globals=' -// Does the compiler advertise C11 conformance? +/* Does the compiler advertise C11 conformance? */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L # error "Compiler does not advertise C11 conformance" #endif @@ -2367,12 +2381,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2381,18 +2395,18 @@ printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -2408,11 +2422,11 @@ printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## @@ -2450,8 +2464,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2473,7 +2487,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2495,8 +2510,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2518,7 +2533,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2553,8 +2569,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2576,7 +2592,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2598,8 +2615,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -2638,7 +2655,8 @@ if test $ac_prog_rejected = yes; then ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2662,8 +2680,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2685,7 +2703,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2711,8 +2730,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2734,7 +2753,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2772,8 +2792,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2795,7 +2815,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2817,8 +2838,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2840,7 +2861,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2869,10 +2891,10 @@ fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2944,8 +2966,8 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. +# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -2965,7 +2987,7 @@ do ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' + # safe: cross compilers may not add the suffix if given an '-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -2976,8 +2998,9 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else $as_nop - ac_file='' +else case e in #( + e) ac_file='' ;; +esac fi if test -z "$ac_file" then : @@ -2986,13 +3009,14 @@ printf "%s\n" "no" >&6; } printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 printf %s "checking for C compiler default output file name... " >&6; } @@ -3016,10 +3040,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. + # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) +# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will +# work properly (i.e., refer to 'conftest.exe'), while it won't with +# 'rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -3029,11 +3053,12 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi rm -f conftest conftest$ac_cv_exeext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3049,6 +3074,8 @@ int main (void) { FILE *f = fopen ("conftest.out", "w"); + if (!f) + return 1; return ferror (f) || fclose (f) != 0; ; @@ -3088,26 +3115,27 @@ printf "%s\n" "$ac_try_echo"; } >&5 if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use '--host'. +See 'config.log' for more details" "$LINENO" 5; } fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +rm -f conftest.$ac_ext conftest$ac_cv_exeext \ + conftest.o conftest.obj conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } if test ${ac_cv_objext+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3139,16 +3167,18 @@ then : break;; esac done -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext +rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 printf "%s\n" "$ac_cv_objext" >&6; } @@ -3159,8 +3189,8 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } if test ${ac_cv_c_compiler_gnu+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3177,12 +3207,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes -else $as_nop - ac_compiler_gnu=no +else case e in #( + e) ac_compiler_gnu=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } @@ -3200,8 +3232,8 @@ printf %s "checking whether $CC accepts -g... " >&6; } if test ${ac_cv_prog_cc_g+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_save_c_werror_flag=$ac_c_werror_flag +else case e in #( + e) ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -3219,8 +3251,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes -else $as_nop - CFLAGS="" +else case e in #( + e) CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3235,8 +3267,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - ac_c_werror_flag=$ac_save_c_werror_flag +else case e in #( + e) ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3253,12 +3285,15 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag + ac_c_werror_flag=$ac_save_c_werror_flag ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 printf "%s\n" "$ac_cv_prog_cc_g" >&6; } @@ -3285,8 +3320,8 @@ printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c11=no +else case e in #( + e) ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3303,25 +3338,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" + CC="$CC $ac_cv_prog_cc_c11" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 + ac_prog_cc_stdc=c11 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -3331,8 +3369,8 @@ printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c99=no +else case e in #( + e) ac_cv_prog_cc_c99=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3349,25 +3387,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c99" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" + CC="$CC $ac_cv_prog_cc_c99" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 + ac_prog_cc_stdc=c99 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -3377,8 +3418,8 @@ printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c89=no +else case e in #( + e) ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3395,25 +3436,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c89" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" + CC="$CC $ac_cv_prog_cc_c89" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 + ac_prog_cc_stdc=c89 ;; +esac fi fi @@ -3475,13 +3519,14 @@ then : printf "%s\n" "DUPLICATE_PATHS=$with_duplicatePaths" >&6; } printf "%s\n" "#define DUPLICATE_PATHS \"$with_duplicatePaths\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DUPLICATE_PATHS=$withval" >&5 printf "%s\n" "DUPLICATE_PATHS=$withval" >&6; } DUPLICATE_PATHS="$withval" printf "%s\n" "#define DUPLICATE_PATHS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3496,13 +3541,14 @@ then : printf "%s\n" "LMOD_ALLOW_ROOT_USE=$with_allowRootUse" >&6; } printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$with_allowRootUse\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_ALLOW_ROOT_USE=$withval" >&5 printf "%s\n" "LMOD_ALLOW_ROOT_USE=$withval" >&6; } LMOD_ALLOW_ROOT_USE="$withval" printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3515,13 +3561,14 @@ then : printf "%s\n" "SITE_MSG_FILE=$with_siteMsgFile" >&6; } printf "%s\n" "#define SITE_MSG_FILE \"$with_siteMsgFile\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_MSG_FILE=$withval" >&5 printf "%s\n" "SITE_MSG_FILE=$withval" >&6; } SITE_MSG_FILE="$withval" printf "%s\n" "#define SITE_MSG_FILE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3534,13 +3581,14 @@ then : printf "%s\n" "LMOD_OVERRIDE_LANG=$with_lang" >&6; } printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$with_lang\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_OVERRIDE_LANG=$withval" >&5 printf "%s\n" "LMOD_OVERRIDE_LANG=$withval" >&6; } LMOD_OVERRIDE_LANG="$withval" printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3555,13 +3603,14 @@ then : printf "%s\n" "CASE_INDEPENDENT_SORTING=$with_caseIndependentSorting" >&6; } printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$with_caseIndependentSorting\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CASE_INDEPENDENT_SORTING=$withval" >&5 printf "%s\n" "CASE_INDEPENDENT_SORTING=$withval" >&6; } CASE_INDEPENDENT_SORTING="$withval" printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3576,13 +3625,14 @@ then : printf "%s\n" "COLORIZE=$with_colorize" >&6; } printf "%s\n" "#define COLORIZE \"$with_colorize\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: COLORIZE=$withval" >&5 printf "%s\n" "COLORIZE=$withval" >&6; } COLORIZE="$withval" printf "%s\n" "#define COLORIZE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3597,13 +3647,14 @@ then : printf "%s\n" "DYNAMIC_SPIDER_CACHE=$with_dynamicSpiderCache" >&6; } printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$with_dynamicSpiderCache\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DYNAMIC_SPIDER_CACHE=$withval" >&5 printf "%s\n" "DYNAMIC_SPIDER_CACHE=$withval" >&6; } DYNAMIC_SPIDER_CACHE="$withval" printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3618,13 +3669,14 @@ then : printf "%s\n" "HIDDEN_ITALIC=$with_hiddenItalic" >&6; } printf "%s\n" "#define HIDDEN_ITALIC \"$with_hiddenItalic\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HIDDEN_ITALIC=$withval" >&5 printf "%s\n" "HIDDEN_ITALIC=$withval" >&6; } HIDDEN_ITALIC="$withval" printf "%s\n" "#define HIDDEN_ITALIC \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3639,13 +3691,14 @@ then : printf "%s\n" "EXACT_MATCH=$with_exactMatch" >&6; } printf "%s\n" "#define EXACT_MATCH \"$with_exactMatch\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXACT_MATCH=$withval" >&5 printf "%s\n" "EXACT_MATCH=$withval" >&6; } EXACT_MATCH="$withval" printf "%s\n" "#define EXACT_MATCH \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3659,13 +3712,14 @@ then : printf "%s\n" "MODE=$with_mode" >&6; } printf "%s\n" "#define MODE \"$with_mode\"" >>confdefs.h -else $as_nop - withval="user_default" +else case e in #( + e) withval="user_default" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODE=$withval" >&5 printf "%s\n" "MODE=$withval" >&6; } MODE="$withval" printf "%s\n" "#define MODE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3678,13 +3732,14 @@ then : printf "%s\n" "LMOD_CONFIG_DIR=$with_lmodConfigDir" >&6; } printf "%s\n" "#define LMOD_CONFIG_DIR \"$with_lmodConfigDir\"" >>confdefs.h -else $as_nop - withval="/etc/lmod" +else case e in #( + e) withval="/etc/lmod" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_CONFIG_DIR=$withval" >&5 printf "%s\n" "LMOD_CONFIG_DIR=$withval" >&6; } LMOD_CONFIG_DIR="$withval" printf "%s\n" "#define LMOD_CONFIG_DIR \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3699,13 +3754,14 @@ then : printf "%s\n" "AUTO_SWAP=$with_autoSwap" >&6; } printf "%s\n" "#define AUTO_SWAP \"$with_autoSwap\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AUTO_SWAP=$withval" >&5 printf "%s\n" "AUTO_SWAP=$withval" >&6; } AUTO_SWAP="$withval" printf "%s\n" "#define AUTO_SWAP \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3722,13 +3778,14 @@ then : printf "%s\n" "EXPORT_MODULE=$with_exportedModuleCmd" >&6; } printf "%s\n" "#define EXPORT_MODULE \"$with_exportedModuleCmd\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXPORT_MODULE=$withval" >&5 printf "%s\n" "EXPORT_MODULE=$withval" >&6; } EXPORT_MODULE="$withval" printf "%s\n" "#define EXPORT_MODULE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3743,13 +3800,14 @@ then : printf "%s\n" "REDIRECT=$with_redirect" >&6; } printf "%s\n" "#define REDIRECT \"$with_redirect\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: REDIRECT=$withval" >&5 printf "%s\n" "REDIRECT=$withval" >&6; } REDIRECT="$withval" printf "%s\n" "#define REDIRECT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3761,13 +3819,14 @@ then : printf "%s\n" "MODULEPATH_ROOT=$with_module_root_path" >&6; } printf "%s\n" "#define MODULEPATH_ROOT \"$with_module_root_path\"" >>confdefs.h -else $as_nop - withval="$prefix/modulefiles" +else case e in #( + e) withval="$prefix/modulefiles" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_ROOT=$withval" >&5 printf "%s\n" "MODULEPATH_ROOT=$withval" >&6; } MODULEPATH_ROOT="$withval" printf "%s\n" "#define MODULEPATH_ROOT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3780,13 +3839,14 @@ then : printf "%s\n" "ANCIENT=$with_ancient" >&6; } printf "%s\n" "#define ANCIENT \"$with_ancient\"" >>confdefs.h -else $as_nop - withval="86400" +else case e in #( + e) withval="86400" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ANCIENT=$withval" >&5 printf "%s\n" "ANCIENT=$withval" >&6; } ANCIENT="$withval" printf "%s\n" "#define ANCIENT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3799,13 +3859,14 @@ then : printf "%s\n" "SHORT_TIME=$with_shortTime" >&6; } printf "%s\n" "#define SHORT_TIME \"$with_shortTime\"" >>confdefs.h -else $as_nop - withval="2" +else case e in #( + e) withval="2" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SHORT_TIME=$withval" >&5 printf "%s\n" "SHORT_TIME=$withval" >&6; } SHORT_TIME="$withval" printf "%s\n" "#define SHORT_TIME \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3818,13 +3879,14 @@ then : printf "%s\n" "SPIDER_CACHE_DIRS=$with_spiderCacheDir" >&6; } printf "%s\n" "#define SPIDER_CACHE_DIRS \"$with_spiderCacheDir\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DIRS=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DIRS=$withval" >&6; } SPIDER_CACHE_DIRS="$withval" printf "%s\n" "#define SPIDER_CACHE_DIRS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3837,13 +3899,14 @@ then : printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$with_spiderCacheDescript" >&6; } printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$with_spiderCacheDescript\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DESCRIPT_FN=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$withval" >&6; } SPIDER_CACHE_DESCRIPT_FN="$withval" printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3856,13 +3919,14 @@ then : printf "%s\n" "UPDATE_SYSTEM_FN=$with_updateSystemFn" >&6; } printf "%s\n" "#define UPDATE_SYSTEM_FN \"$with_updateSystemFn\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: UPDATE_SYSTEM_FN=$withval" >&5 printf "%s\n" "UPDATE_SYSTEM_FN=$withval" >&6; } UPDATE_SYSTEM_FN="$withval" printf "%s\n" "#define UPDATE_SYSTEM_FN \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3875,13 +3939,14 @@ then : printf "%s\n" "PREPEND_BLOCK=$with_prependBlock" >&6; } printf "%s\n" "#define PREPEND_BLOCK \"$with_prependBlock\"" >>confdefs.h -else $as_nop - withval="normal" +else case e in #( + e) withval="normal" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PREPEND_BLOCK=$withval" >&5 printf "%s\n" "PREPEND_BLOCK=$withval" >&6; } PREPEND_BLOCK="$withval" printf "%s\n" "#define PREPEND_BLOCK \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3894,13 +3959,14 @@ then : printf "%s\n" "SITE_NAME=$with_siteName" >&6; } printf "%s\n" "#define SITE_NAME \"$with_siteName\"" >>confdefs.h -else $as_nop - withval='' +else case e in #( + e) withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_NAME=$withval" >&5 printf "%s\n" "SITE_NAME=$withval" >&6; } SITE_NAME="$withval" printf "%s\n" "#define SITE_NAME \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3913,13 +3979,14 @@ then : printf "%s\n" "SYSHOST=$with_syshost" >&6; } printf "%s\n" "#define SYSHOST \"$with_syshost\"" >>confdefs.h -else $as_nop - withval='' +else case e in #( + e) withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SYSHOST=$withval" >&5 printf "%s\n" "SYSHOST=$withval" >&6; } SYSHOST="$withval" printf "%s\n" "#define SYSHOST \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3934,13 +4001,14 @@ then : printf "%s\n" "ALLOW_TCL_MFILES==$withval" >&6; } printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ALLOW_TCL_MFILES=$withval" >&5 printf "%s\n" "ALLOW_TCL_MFILES=$withval" >&6; } ALLOW_TCL_MFILES="$withval" printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3955,13 +4023,14 @@ then : printf "%s\n" "DISABLE_NAME_AUTOSWAP==$withval" >&6; } printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DISABLE_NAME_AUTOSWAP=$withval" >&5 printf "%s\n" "DISABLE_NAME_AUTOSWAP=$withval" >&6; } DISABLE_NAME_AUTOSWAP="$withval" printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3976,13 +4045,14 @@ then : printf "%s\n" "MPATH_AVAIL==$withval" >&6; } printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MPATH_AVAIL=$withval" >&5 printf "%s\n" "MPATH_AVAIL=$withval" >&6; } MPATH_AVAIL="$withval" printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3997,13 +4067,14 @@ then : printf "%s\n" "SETTARG=$with_settarg" >&6; } printf "%s\n" "#define SETTARG \"$with_settarg\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SETTARG=$withval" >&5 printf "%s\n" "SETTARG=$withval" >&6; } SETTARG="$withval" printf "%s\n" "#define SETTARG \"$withval\"" >>confdefs.h - + ;; +esac fi DFLT_IGNORE_DIRS=".svn,.git,.hg,.bzr" @@ -4018,13 +4089,14 @@ then : printf "%s\n" "IGNORE_DIRS=$with_ignoreDirs" >&6; } printf "%s\n" "#define IGNORE_DIRS \"$with_ignoreDirs\"" >>confdefs.h -else $as_nop - withval="$DFLT_IGNORE_DIRS" +else case e in #( + e) withval="$DFLT_IGNORE_DIRS" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IGNORE_DIRS=$withval" >&5 printf "%s\n" "IGNORE_DIRS=$withval" >&6; } IGNORE_DIRS="$withval" printf "%s\n" "#define IGNORE_DIRS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4039,13 +4111,14 @@ then : printf "%s\n" "PIN_VERSIONS=$with_pinVersions" >&6; } printf "%s\n" "#define PIN_VERSIONS \"$with_pinVersions\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PIN_VERSIONS=$withval" >&5 printf "%s\n" "PIN_VERSIONS=$withval" >&6; } PIN_VERSIONS="$withval" printf "%s\n" "#define PIN_VERSIONS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4060,13 +4133,14 @@ then : printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$with_downstreamConflicts" >&6; } printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$with_downstreamConflicts\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_DOWNSTREAM_CONFLICTS=$withval" >&5 printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$withval" >&6; } LMOD_DOWNSTREAM_CONFLICTS="$withval" printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4081,13 +4155,14 @@ then : printf "%s\n" "MODULES_AUTO_HANDLING=$with_modulesAutoHandling" >&6; } printf "%s\n" "#define MODULES_AUTO_HANDLING \"$with_modulesAutoHandling\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULES_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULES_AUTO_HANDLING=$withval" >&6; } MODULES_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULES_AUTO_HANDLING \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4102,13 +4177,14 @@ then : printf "%s\n" "TMOD_PATH_RULE=$with_tmodPathRule" >&6; } printf "%s\n" "#define TMOD_PATH_RULE \"$with_tmodPathRule\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_PATH_RULE=$withval" >&5 printf "%s\n" "TMOD_PATH_RULE=$withval" >&6; } TMOD_PATH_RULE="$withval" printf "%s\n" "#define TMOD_PATH_RULE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4123,13 +4199,14 @@ then : printf "%s\n" "TMOD_FIND_FIRST=$with_tmodFindFirst" >&6; } printf "%s\n" "#define TMOD_FIND_FIRST \"$with_tmodFindFirst\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_FIND_FIRST=$withval" >&5 printf "%s\n" "TMOD_FIND_FIRST=$withval" >&6; } TMOD_FIND_FIRST="$withval" printf "%s\n" "#define TMOD_FIND_FIRST \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4142,13 +4219,14 @@ then : printf "%s\n" "LUA_INCLUDE=$with_lua_include" >&6; } printf "%s\n" "#define LUA_INCLUDE \"$with_lua_include\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_INCLUDE=$withval" >&5 printf "%s\n" "LUA_INCLUDE=$withval" >&6; } LUA_INCLUDE="$withval" printf "%s\n" "#define LUA_INCLUDE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4163,13 +4241,14 @@ then : printf "%s\n" "CACHED_LOADS=$with_cachedLoads" >&6; } printf "%s\n" "#define CACHED_LOADS \"$with_cachedLoads\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CACHED_LOADS=$withval" >&5 printf "%s\n" "CACHED_LOADS=$withval" >&6; } CACHED_LOADS="$withval" printf "%s\n" "#define CACHED_LOADS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4184,13 +4263,14 @@ then : printf "%s\n" "EXTENDED_DEFAULT=$with_extendedDefault" >&6; } printf "%s\n" "#define EXTENDED_DEFAULT \"$with_extendedDefault\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXTENDED_DEFAULT=$withval" >&5 printf "%s\n" "EXTENDED_DEFAULT=$withval" >&6; } EXTENDED_DEFAULT="$withval" printf "%s\n" "#define EXTENDED_DEFAULT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4205,13 +4285,14 @@ then : printf "%s\n" "SUPPORT_KSH=$with_supportKsh" >&6; } printf "%s\n" "#define SUPPORT_KSH \"$with_supportKsh\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SUPPORT_KSH=$withval" >&5 printf "%s\n" "SUPPORT_KSH=$withval" >&6; } SUPPORT_KSH="$withval" printf "%s\n" "#define SUPPORT_KSH \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4224,13 +4305,14 @@ then : printf "%s\n" "MODULEPATH_INIT=$with_ModulePathInit" >&6; } printf "%s\n" "#define MODULEPATH_INIT \"$with_ModulePathInit\"" >>confdefs.h -else $as_nop - withval="@PKG@/init/.modulespath" +else case e in #( + e) withval="@PKG@/init/.modulespath" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_INIT=$withval" >&5 printf "%s\n" "MODULEPATH_INIT=$withval" >&6; } MODULEPATH_INIT="$withval" printf "%s\n" "#define MODULEPATH_INIT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4245,13 +4327,14 @@ then : printf "%s\n" "SITE_CONTROLLED_PREFIX=$with_siteControlPrefix" >&6; } printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$with_siteControlPrefix\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_CONTROLLED_PREFIX=$withval" >&5 printf "%s\n" "SITE_CONTROLLED_PREFIX=$withval" >&6; } SITE_CONTROLLED_PREFIX="$withval" printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4266,13 +4349,14 @@ then : printf "%s\n" "USE_BUILT_IN_PKGS=$with_useBuiltinPkgs" >&6; } printf "%s\n" "#define USE_BUILT_IN_PKGS \"$with_useBuiltinPkgs\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_BUILT_IN_PKGS=$withval" >&5 printf "%s\n" "USE_BUILT_IN_PKGS=$withval" >&6; } USE_BUILT_IN_PKGS="$withval" printf "%s\n" "#define USE_BUILT_IN_PKGS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4287,13 +4371,14 @@ then : printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$with_useDotConfigDirOnly" >&6; } printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$with_useDotConfigDirOnly\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_DOT_CONFIG_DIR_ONLY=$withval" >&5 printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$withval" >&6; } USE_DOT_CONFIG_DIR_ONLY="$withval" printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4308,13 +4393,14 @@ then : printf "%s\n" "SILENCE_SHELL_DEBUGGING=$with_silentShellDebugging" >&6; } printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$with_silentShellDebugging\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SILENCE_SHELL_DEBUGGING=$withval" >&5 printf "%s\n" "SILENCE_SHELL_DEBUGGING=$withval" >&6; } SILENCE_SHELL_DEBUGGING="$withval" printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4329,13 +4415,14 @@ then : printf "%s\n" "FAST_TCL_INTERP=$with_fastTCLInterp" >&6; } printf "%s\n" "#define FAST_TCL_INTERP \"$with_fastTCLInterp\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FAST_TCL_INTERP=$withval" >&5 printf "%s\n" "FAST_TCL_INTERP=$withval" >&6; } FAST_TCL_INTERP="$withval" printf "%s\n" "#define FAST_TCL_INTERP \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4350,13 +4437,14 @@ then : printf "%s\n" "MODULE_AUTO_HANDLING=$with-moduleAutoHandling" >&6; } printf "%s\n" "#define MODULE_AUTO_HANDLING \"$with-moduleAutoHandling\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULE_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULE_AUTO_HANDLING=$withval" >&6; } MODULE_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULE_AUTO_HANDLING \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4371,13 +4459,14 @@ then : printf "%s\n" "AVAIL_EXTENSIONS=$with_availExtensions" >&6; } printf "%s\n" "#define AVAIL_EXTENSIONS \"$with_availExtensions\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AVAIL_EXTENSIONS=$withval" >&5 printf "%s\n" "AVAIL_EXTENSIONS=$withval" >&6; } AVAIL_EXTENSIONS="$withval" printf "%s\n" "#define AVAIL_EXTENSIONS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4395,13 +4484,14 @@ then : printf "%s\n" "PATH_TO_LUA=$with_lua" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$with_lua\"" >>confdefs.h -else $as_nop - withval="lua" +else case e in #( + e) withval="lua" PATH_TO_LUA="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$withval" >&5 printf "%s\n" "PATH_TO_LUA=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4419,13 +4509,14 @@ then : printf "%s\n" "PATH_TO_LUAC=$with_luac" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$with_luac\"" >>confdefs.h -else $as_nop - withval="luac" +else case e in #( + e) withval="luac" PATH_TO_LUAC="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$withval" >&5 printf "%s\n" "PATH_TO_LUAC=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4440,13 +4531,14 @@ then : printf "%s\n" "LUA_SUFFIX=$with_luaSuffic" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$with_luaSuffix\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" LUA_SUFFIX="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_SUFFIX=$withval" >&5 printf "%s\n" "LUA_SUFFIX=$withval" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$withval\"" >>confdefs.h - + ;; +esac fi if test "$ALLOW_TCL_MFILES" = no ; then @@ -4475,8 +4567,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else $as_nop - case $pkgConfig in +else case e in #( + e) case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -4502,6 +4594,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; +esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -4558,8 +4651,8 @@ then : printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "tcl.hh" "ac_cv_header_tcl_hh" "$ac_includes_default" -if test "x$ac_cv_header_tcl_hh" = xyes +ac_fn_c_check_header_compile "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default" +if test "x$ac_cv_header_tcl_h" = xyes then : printf "%s\n" "#define HAVE_TCL_H 1" >>confdefs.h @@ -4580,15 +4673,21 @@ printf %s "checking for library containing Tcl_CreateInterp... " >&6; } if test ${ac_cv_search_Tcl_CreateInterp+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char Tcl_CreateInterp (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char Tcl_CreateInterp (void); int main (void) { @@ -4619,11 +4718,13 @@ done if test ${ac_cv_search_Tcl_CreateInterp+y} then : -else $as_nop - ac_cv_search_Tcl_CreateInterp=no +else case e in #( + e) ac_cv_search_Tcl_CreateInterp=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_Tcl_CreateInterp" >&5 printf "%s\n" "$ac_cv_search_Tcl_CreateInterp" >&6; } @@ -4632,8 +4733,9 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop - rm -f makefile; as_fn_error $? "Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" "$LINENO" 5 +else case e in #( + e) rm -f makefile; as_fn_error $? "Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" "$LINENO" 5 ;; +esac fi @@ -4666,14 +4768,6 @@ PATH_TO_SRC=$SRCDIR -FOUND_ERROR=yes -MSG="MODE must have at least one executable bit set (Not MODE=$MODE)| -Please try setting mode to 755 or 750 or 700 or similar." - - echo "$MSG" - echo -ERR_MSG="$ERR_MSG||$MSG" - if test $MODE == "user_default" ; then mode=0755 EXEC_BITS=$(( 0111 & $mode )); @@ -4698,8 +4792,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PS+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PS in +else case e in #( + e) case $PS in [\\/]* | ?:[\\/]*) ac_cv_path_PS="$PS" # Let the user override the test with a path. ;; @@ -4725,6 +4819,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PS" && ac_cv_path_PS="UNKNOWN_PS" ;; +esac ;; esac fi PS=$ac_cv_path_PS @@ -4752,8 +4847,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_READLINK+y} then : printf %s "(cached) " >&6 -else $as_nop - case $READLINK in +else case e in #( + e) case $READLINK in [\\/]* | ?:[\\/]*) ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path. ;; @@ -4779,6 +4874,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_READLINK" && ac_cv_path_READLINK="UNKNOWN_READLINK" ;; +esac ;; esac fi READLINK=$ac_cv_path_READLINK @@ -4808,8 +4904,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_EXPR+y} then : printf %s "(cached) " >&6 -else $as_nop - case $EXPR in +else case e in #( + e) case $EXPR in [\\/]* | ?:[\\/]*) ac_cv_path_EXPR="$EXPR" # Let the user override the test with a path. ;; @@ -4834,6 +4930,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi EXPR=$ac_cv_path_EXPR @@ -4867,8 +4964,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BASENAME+y} then : printf %s "(cached) " >&6 -else $as_nop - case $BASENAME in +else case e in #( + e) case $BASENAME in [\\/]* | ?:[\\/]*) ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path. ;; @@ -4893,6 +4990,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi BASENAME=$ac_cv_path_BASENAME @@ -4926,8 +5024,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BC+y} then : printf %s "(cached) " >&6 -else $as_nop - case $BC in +else case e in #( + e) case $BC in [\\/]* | ?:[\\/]*) ac_cv_path_BC="$BC" # Let the user override the test with a path. ;; @@ -4952,6 +5050,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi BC=$ac_cv_path_BC @@ -4983,8 +5082,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_POD2MAN+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_POD2MAN in +else case e in #( + e) case $PATH_TO_POD2MAN in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_POD2MAN="$PATH_TO_POD2MAN" # Let the user override the test with a path. ;; @@ -5010,6 +5109,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_POD2MAN" && ac_cv_path_PATH_TO_POD2MAN="UNKNOWN_POD2MAN" ;; +esac ;; esac fi PATH_TO_POD2MAN=$ac_cv_path_PATH_TO_POD2MAN @@ -5030,8 +5130,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_GIT+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_GIT in +else case e in #( + e) case $PATH_TO_GIT in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_GIT="$PATH_TO_GIT" # Let the user override the test with a path. ;; @@ -5057,6 +5157,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_GIT" && ac_cv_path_PATH_TO_GIT="""" ;; +esac ;; esac fi PATH_TO_GIT=$ac_cv_path_PATH_TO_GIT @@ -5078,8 +5179,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_PAGER+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_PAGER in +else case e in #( + e) case $PATH_TO_PAGER in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_PAGER="$PATH_TO_PAGER" # Let the user override the test with a path. ;; @@ -5104,6 +5205,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PATH_TO_PAGER=$ac_cv_path_PATH_TO_PAGER @@ -5130,8 +5232,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_HASHSUM+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_HASHSUM in +else case e in #( + e) case $PATH_TO_HASHSUM in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_HASHSUM="$PATH_TO_HASHSUM" # Let the user override the test with a path. ;; @@ -5156,6 +5258,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PATH_TO_HASHSUM=$ac_cv_path_PATH_TO_HASHSUM @@ -5189,8 +5292,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TCLSH+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_TCLSH in +else case e in #( + e) case $PATH_TO_TCLSH in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TCLSH="$PATH_TO_TCLSH" # Let the user override the test with a path. ;; @@ -5216,6 +5319,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_TCLSH" && ac_cv_path_PATH_TO_TCLSH="UNKNOWN_TCLSH" ;; +esac ;; esac fi PATH_TO_TCLSH=$ac_cv_path_PATH_TO_TCLSH @@ -5244,8 +5348,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TR+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_TR in +else case e in #( + e) case $PATH_TO_TR in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TR="$PATH_TO_TR" # Let the user override the test with a path. ;; @@ -5270,6 +5374,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PATH_TO_TR=$ac_cv_path_PATH_TO_TR @@ -5295,8 +5400,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_LS+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_LS in +else case e in #( + e) case $PATH_TO_LS in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_LS="$PATH_TO_LS" # Let the user override the test with a path. ;; @@ -5321,6 +5426,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PATH_TO_LS=$ac_cv_path_PATH_TO_LS @@ -5386,8 +5492,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUA+y} then : printf %s "(cached) " >&6 -else $as_nop - case $FIND_PATH_TO_LUA in +else case e in #( + e) case $FIND_PATH_TO_LUA in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUA="$FIND_PATH_TO_LUA" # Let the user override the test with a path. ;; @@ -5412,6 +5518,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi FIND_PATH_TO_LUA=$ac_cv_path_FIND_PATH_TO_LUA @@ -5441,8 +5548,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUAC+y} then : printf %s "(cached) " >&6 -else $as_nop - case $FIND_PATH_TO_LUAC in +else case e in #( + e) case $FIND_PATH_TO_LUAC in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUAC="$FIND_PATH_TO_LUAC" # Let the user override the test with a path. ;; @@ -5467,6 +5574,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi FIND_PATH_TO_LUAC=$ac_cv_path_FIND_PATH_TO_LUAC @@ -5613,8 +5721,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else $as_nop - case $pkgConfig in +else case e in #( + e) case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -5640,6 +5748,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; +esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -5709,8 +5818,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ZSH+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ZSH in +else case e in #( + e) case $ZSH in [\\/]* | ?:[\\/]*) ac_cv_path_ZSH="$ZSH" # Let the user override the test with a path. ;; @@ -5735,6 +5844,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ZSH=$ac_cv_path_ZSH @@ -5818,8 +5928,8 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the +# 'ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* 'ac_cv_foo' will be assigned the # following values. _ACEOF @@ -5849,14 +5959,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote + # 'set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # `set' quotes correctly as required by POSIX, so do not add quotes. + # 'set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -5920,9 +6030,7 @@ s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g t quote b any :quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g +s/[][ `~#$^&*(){}\\|;'\''"<>?]/\\&/g s/\$/$$/g H :any @@ -5982,7 +6090,6 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -5991,12 +6098,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi @@ -6068,7 +6176,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -6097,7 +6205,6 @@ as_fn_error () } # as_fn_error - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -6137,11 +6244,12 @@ then : { eval $1+=\$2 }' -else $as_nop - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -6155,11 +6263,12 @@ then : { as_val=$(( $* )) }' -else $as_nop - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith @@ -6242,9 +6351,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -6325,10 +6434,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated exec 6>&1 @@ -6344,7 +6455,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.71. Invocation command line was +generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6371,7 +6482,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions +'$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -6399,10 +6510,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.71, +configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -6459,8 +6570,8 @@ do ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: '$1' +Try '$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -6510,7 +6621,7 @@ do case $ac_config_target in "makefile") CONFIG_FILES="$CONFIG_FILES makefile:Makefile.in" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; esac done @@ -6528,7 +6639,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. +# after its creation but before its name has been assigned to '$tmp'. $debug || { tmp= ac_tmp= @@ -6552,7 +6663,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. +# This happens for instance with './config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -6718,7 +6829,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6740,19 +6851,19 @@ do -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. + # because $ac_f cannot contain ':'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is `configure' which instantiates (i.e., don't + # Let's still pretend it is 'configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` @@ -6876,7 +6987,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when `$srcdir' = `.'. +# Neutralize VPATH when '$srcdir' = '.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -6905,9 +7016,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" diff --git a/configure.ac b/configure.ac index 164a0e0bb..9f93b27b9 100644 --- a/configure.ac +++ b/configure.ac @@ -730,7 +730,7 @@ if test "$FAST_TCL_INTERP" = yes ; then CPPFLAGS="$TCL_INCLUDE" - AC_CHECK_HEADER(tcl.hh, + AC_CHECK_HEADER(tcl.h, [AC_DEFINE([HAVE_TCL_H], 1, [Define to 1 if you have tcl.h])],[]) if test "$ac_cv_header_tcl_h" != yes ; then @@ -770,14 +770,6 @@ AC_SUBST(PATH_TO_HASHSUM) AC_SUBST(PATH_TO_PAGER) AC_SUBST(PATH_TO_TCLSH) -FOUND_ERROR=yes -MSG="MODE must have at least one executable bit set (Not MODE=$MODE)| -Please try setting mode to 755 or 750 or 700 or similar." - - echo "$MSG" - echo -ERR_MSG="$ERR_MSG||$MSG" - if test $MODE == "user_default" ; then mode=0755 EXEC_BITS=$(( 0111 & $mode )); From 2e1825ee9edb4f1ff482e9c2f2d75f3ad5e96a31 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 1 Aug 2024 09:01:57 -0500 Subject: [PATCH 048/198] Re-installing UTF-8 fix and man page generation --- tools/Optiks.lua | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/tools/Optiks.lua b/tools/Optiks.lua index ba7eaf389..c5f3396d6 100644 --- a/tools/Optiks.lua +++ b/tools/Optiks.lua @@ -96,6 +96,7 @@ function M.new(self, t) self.argNames = {} self.optA = {} + local descript = "" local envArg = nil local usage = t local version = nil @@ -104,6 +105,7 @@ function M.new(self, t) ProgName = t.progName version = t.version envArg = t.envArg + descript = t.descript Error = t.error or Error l_prt = t.prt or l_prt @@ -117,12 +119,14 @@ function M.new(self, t) ProgName = ProgName .. " " end + o.progName = ProgName o.exit = Exit o.prt = l_prt o.prtEnd = l_prtend o.usage = usage o.version = version o.envArg = envArg + o.descript = descript if (usage == nil) then local cmd = arg[0] local i,j = cmd:find(".*/") @@ -347,7 +351,7 @@ end function M.buildHelpMsg(self) local term_width = TermWidth() local b = {} - b[#b+1] = self.usage + b[#b+1] = "Usage: " .. self.usage b[#b+1] = "\n\nOptions:\n" local a = {} @@ -372,6 +376,28 @@ function M.printHelp(self) self.exit(0) end +function M.buildManPod(self) + local b = {} + b[#b+1] = "=encoding UTF-8" + b[#b+1] = self.progName + b[#b+1] = "=head1 SYNOPSIS" + b[#b+1] = self.usage + b[#b+1] = "=head1 DESCRIPTION" + b[#b+1] = self.descript + b[#b+1] = "=head1 OPTIONS" + b[#b+1] = "=over 4" + local a = {} + for _, v in ipairs(self.optA) do + local opt = v.table + a[#a+1] = "=item I<"..self.dispTbl[opt.action](self, opt)..">" + a[#a+1] = opt.help or " " + end + b[#b+1] = concatTbl(a,"\n\n") + + b[#b+1] = "=back" + return concatTbl(b,"\n\n") +end + -------------------------------------------------------------------------- -- Parse an environment variable before parsing the command line. From f53d79f3290e200c1233cdf90b8db2cc26a4cf6e Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 1 Aug 2024 09:06:09 -0500 Subject: [PATCH 049/198] update configure to report all errors before quiting --- configure | 995 ++++++++++++++++++++++++++++----------------------- configure.ac | 10 +- 2 files changed, 554 insertions(+), 451 deletions(-) diff --git a/configure b/configure index fbf0d484a..32ad3975c 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71. +# Generated by GNU Autoconf 2.72. # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, # Inc. # # @@ -15,7 +15,6 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -24,12 +23,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi @@ -101,7 +101,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -131,15 +131,14 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. +# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh NULLCMD=: @@ -147,12 +146,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else \$as_nop - case \`(set -o) 2>/dev/null\` in #( +else case e in #( + e) case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi " @@ -170,8 +170,9 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : -else \$as_nop - exitcode=1; echo positional parameters were not saved. +else case e in #( + e) exitcode=1; echo positional parameters were not saved. ;; +esac fi test x\$exitcode = x0 || exit 1 blah=\$(echo \$(echo blah)) @@ -184,14 +185,15 @@ test -x / || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes -else $as_nop - as_have_required=no +else case e in #( + e) as_have_required=no ;; +esac fi if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null then : -else $as_nop - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do @@ -224,12 +226,13 @@ IFS=$as_save_IFS if $as_found then : -else $as_nop - if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +else case e in #( + e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null then : CONFIG_SHELL=$SHELL as_have_required=yes -fi +fi ;; +esac fi @@ -251,7 +254,7 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. +# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -270,7 +273,8 @@ $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." fi exit 1 -fi +fi ;; +esac fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -309,14 +313,6 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -385,11 +381,12 @@ then : { eval $1+=\$2 }' -else $as_nop - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -403,21 +400,14 @@ then : { as_val=$(( $* )) }' -else $as_nop - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -491,6 +481,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' + t clear + :clear s/[$]LINENO.*/&-/ t lineno b @@ -539,7 +531,6 @@ esac as_echo='printf %s\n' as_echo_n='printf %s' - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -551,9 +542,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -578,10 +569,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated test -n "$DJDIR" || exec 7<&0 /dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -964,7 +957,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1177,7 +1170,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1193,7 +1186,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1223,8 +1216,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: '$ac_option' +Try '$0 --help' for more information" ;; *=*) @@ -1232,7 +1225,7 @@ Try \`$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: '$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1282,7 +1275,7 @@ do as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: `$host' +# There might be people who depend on the old broken behavior: '$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -1350,7 +1343,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -1378,7 +1371,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +'configure' configures this package to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1392,11 +1385,11 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages + -q, --quiet, --silent do not print 'checking ...' messages --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' + -C, --config-cache alias for '--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] + --srcdir=DIR find the sources in DIR [configure dir or '..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1404,10 +1397,10 @@ Installation directories: --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. +By default, 'make install' will install all the files in +'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify +an installation prefix other than '$ac_default_prefix' using '--prefix', +for instance '--prefix=\$HOME'. For better control, use the options below. @@ -1546,7 +1539,7 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory -Use these variables to override the choices made by `configure' or to help +Use these variables to override the choices made by 'configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to the package provider. @@ -1614,9 +1607,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.71 +generated by GNU Autoconf 2.72 -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1655,11 +1648,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1678,8 +1672,8 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> @@ -1687,10 +1681,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -1730,11 +1726,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -1770,7 +1767,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.71. Invocation command line was +generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -2016,10 +2013,10 @@ esac printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } fi done @@ -2055,9 +2052,7 @@ struct stat; /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; +static char *e (char **p, int i) { return p[i]; } @@ -2071,6 +2066,21 @@ static char *f (char * (*g) (char **, int), char **p, ...) return s; } +/* C89 style stringification. */ +#define noexpand_stringify(a) #a +const char *stringified = noexpand_stringify(arbitrary+token=sequence); + +/* C89 style token pasting. Exercises some of the corner cases that + e.g. old MSVC gets wrong, but not very hard. */ +#define noexpand_concat(a,b) a##b +#define expand_concat(a,b) noexpand_concat(a,b) +extern int vA; +extern int vbee; +#define aye A +#define bee B +int *pvA = &expand_concat(v,aye); +int *pvbee = &noexpand_concat(v,bee); + /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not \xHH hex character constants. These do not provoke an error unfortunately, instead are silently treated @@ -2098,16 +2108,19 @@ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); # Test code for whether the C compiler supports C99 (global declarations) ac_c_conftest_c99_globals=' -// Does the compiler advertise C99 conformance? +/* Does the compiler advertise C99 conformance? */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L # error "Compiler does not advertise C99 conformance" #endif +// See if C++-style comments work. + #include extern int puts (const char *); extern int printf (const char *, ...); extern int dprintf (int, const char *, ...); extern void *malloc (size_t); +extern void free (void *); // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare @@ -2157,7 +2170,6 @@ typedef const char *ccp; static inline int test_restrict (ccp restrict text) { - // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) @@ -2223,6 +2235,8 @@ ac_c_conftest_c99_main=' ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; + // Work around memory leak warnings. + free (ia); // Check named initializers. struct named_init ni = { @@ -2244,7 +2258,7 @@ ac_c_conftest_c99_main=' # Test code for whether the C compiler supports C11 (global declarations) ac_c_conftest_c11_globals=' -// Does the compiler advertise C11 conformance? +/* Does the compiler advertise C11 conformance? */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L # error "Compiler does not advertise C11 conformance" #endif @@ -2367,12 +2381,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2381,18 +2395,18 @@ printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -2408,11 +2422,11 @@ printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## @@ -2450,8 +2464,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2473,7 +2487,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2495,8 +2510,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2518,7 +2533,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2553,8 +2569,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2576,7 +2592,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2598,8 +2615,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -2638,7 +2655,8 @@ if test $ac_prog_rejected = yes; then ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2662,8 +2680,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2685,7 +2703,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2711,8 +2730,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2734,7 +2753,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2772,8 +2792,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2795,7 +2815,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2817,8 +2838,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2840,7 +2861,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2869,10 +2891,10 @@ fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2944,8 +2966,8 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. +# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -2965,7 +2987,7 @@ do ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' + # safe: cross compilers may not add the suffix if given an '-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -2976,8 +2998,9 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else $as_nop - ac_file='' +else case e in #( + e) ac_file='' ;; +esac fi if test -z "$ac_file" then : @@ -2986,13 +3009,14 @@ printf "%s\n" "no" >&6; } printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 printf %s "checking for C compiler default output file name... " >&6; } @@ -3016,10 +3040,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. + # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) +# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will +# work properly (i.e., refer to 'conftest.exe'), while it won't with +# 'rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -3029,11 +3053,12 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi rm -f conftest conftest$ac_cv_exeext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3049,6 +3074,8 @@ int main (void) { FILE *f = fopen ("conftest.out", "w"); + if (!f) + return 1; return ferror (f) || fclose (f) != 0; ; @@ -3088,26 +3115,27 @@ printf "%s\n" "$ac_try_echo"; } >&5 if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use '--host'. +See 'config.log' for more details" "$LINENO" 5; } fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +rm -f conftest.$ac_ext conftest$ac_cv_exeext \ + conftest.o conftest.obj conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } if test ${ac_cv_objext+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3139,16 +3167,18 @@ then : break;; esac done -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext +rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 printf "%s\n" "$ac_cv_objext" >&6; } @@ -3159,8 +3189,8 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } if test ${ac_cv_c_compiler_gnu+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3177,12 +3207,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes -else $as_nop - ac_compiler_gnu=no +else case e in #( + e) ac_compiler_gnu=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } @@ -3200,8 +3232,8 @@ printf %s "checking whether $CC accepts -g... " >&6; } if test ${ac_cv_prog_cc_g+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_save_c_werror_flag=$ac_c_werror_flag +else case e in #( + e) ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -3219,8 +3251,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes -else $as_nop - CFLAGS="" +else case e in #( + e) CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3235,8 +3267,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - ac_c_werror_flag=$ac_save_c_werror_flag +else case e in #( + e) ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3253,12 +3285,15 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag + ac_c_werror_flag=$ac_save_c_werror_flag ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 printf "%s\n" "$ac_cv_prog_cc_g" >&6; } @@ -3285,8 +3320,8 @@ printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c11=no +else case e in #( + e) ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3303,25 +3338,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" + CC="$CC $ac_cv_prog_cc_c11" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 + ac_prog_cc_stdc=c11 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -3331,8 +3369,8 @@ printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c99=no +else case e in #( + e) ac_cv_prog_cc_c99=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3349,25 +3387,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c99" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" + CC="$CC $ac_cv_prog_cc_c99" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 + ac_prog_cc_stdc=c99 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -3377,8 +3418,8 @@ printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c89=no +else case e in #( + e) ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3395,25 +3436,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c89" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" + CC="$CC $ac_cv_prog_cc_c89" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 + ac_prog_cc_stdc=c89 ;; +esac fi fi @@ -3475,13 +3519,14 @@ then : printf "%s\n" "DUPLICATE_PATHS=$with_duplicatePaths" >&6; } printf "%s\n" "#define DUPLICATE_PATHS \"$with_duplicatePaths\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DUPLICATE_PATHS=$withval" >&5 printf "%s\n" "DUPLICATE_PATHS=$withval" >&6; } DUPLICATE_PATHS="$withval" printf "%s\n" "#define DUPLICATE_PATHS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3496,13 +3541,14 @@ then : printf "%s\n" "LMOD_ALLOW_ROOT_USE=$with_allowRootUse" >&6; } printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$with_allowRootUse\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_ALLOW_ROOT_USE=$withval" >&5 printf "%s\n" "LMOD_ALLOW_ROOT_USE=$withval" >&6; } LMOD_ALLOW_ROOT_USE="$withval" printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3515,13 +3561,14 @@ then : printf "%s\n" "SITE_MSG_FILE=$with_siteMsgFile" >&6; } printf "%s\n" "#define SITE_MSG_FILE \"$with_siteMsgFile\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_MSG_FILE=$withval" >&5 printf "%s\n" "SITE_MSG_FILE=$withval" >&6; } SITE_MSG_FILE="$withval" printf "%s\n" "#define SITE_MSG_FILE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3534,13 +3581,14 @@ then : printf "%s\n" "LMOD_OVERRIDE_LANG=$with_lang" >&6; } printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$with_lang\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_OVERRIDE_LANG=$withval" >&5 printf "%s\n" "LMOD_OVERRIDE_LANG=$withval" >&6; } LMOD_OVERRIDE_LANG="$withval" printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3555,13 +3603,14 @@ then : printf "%s\n" "CASE_INDEPENDENT_SORTING=$with_caseIndependentSorting" >&6; } printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$with_caseIndependentSorting\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CASE_INDEPENDENT_SORTING=$withval" >&5 printf "%s\n" "CASE_INDEPENDENT_SORTING=$withval" >&6; } CASE_INDEPENDENT_SORTING="$withval" printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3576,13 +3625,14 @@ then : printf "%s\n" "COLORIZE=$with_colorize" >&6; } printf "%s\n" "#define COLORIZE \"$with_colorize\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: COLORIZE=$withval" >&5 printf "%s\n" "COLORIZE=$withval" >&6; } COLORIZE="$withval" printf "%s\n" "#define COLORIZE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3597,13 +3647,14 @@ then : printf "%s\n" "DYNAMIC_SPIDER_CACHE=$with_dynamicSpiderCache" >&6; } printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$with_dynamicSpiderCache\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DYNAMIC_SPIDER_CACHE=$withval" >&5 printf "%s\n" "DYNAMIC_SPIDER_CACHE=$withval" >&6; } DYNAMIC_SPIDER_CACHE="$withval" printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3618,13 +3669,14 @@ then : printf "%s\n" "HIDDEN_ITALIC=$with_hiddenItalic" >&6; } printf "%s\n" "#define HIDDEN_ITALIC \"$with_hiddenItalic\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HIDDEN_ITALIC=$withval" >&5 printf "%s\n" "HIDDEN_ITALIC=$withval" >&6; } HIDDEN_ITALIC="$withval" printf "%s\n" "#define HIDDEN_ITALIC \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3639,13 +3691,14 @@ then : printf "%s\n" "EXACT_MATCH=$with_exactMatch" >&6; } printf "%s\n" "#define EXACT_MATCH \"$with_exactMatch\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXACT_MATCH=$withval" >&5 printf "%s\n" "EXACT_MATCH=$withval" >&6; } EXACT_MATCH="$withval" printf "%s\n" "#define EXACT_MATCH \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3659,13 +3712,14 @@ then : printf "%s\n" "MODE=$with_mode" >&6; } printf "%s\n" "#define MODE \"$with_mode\"" >>confdefs.h -else $as_nop - withval="user_default" +else case e in #( + e) withval="user_default" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODE=$withval" >&5 printf "%s\n" "MODE=$withval" >&6; } MODE="$withval" printf "%s\n" "#define MODE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3678,13 +3732,14 @@ then : printf "%s\n" "LMOD_CONFIG_DIR=$with_lmodConfigDir" >&6; } printf "%s\n" "#define LMOD_CONFIG_DIR \"$with_lmodConfigDir\"" >>confdefs.h -else $as_nop - withval="/etc/lmod" +else case e in #( + e) withval="/etc/lmod" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_CONFIG_DIR=$withval" >&5 printf "%s\n" "LMOD_CONFIG_DIR=$withval" >&6; } LMOD_CONFIG_DIR="$withval" printf "%s\n" "#define LMOD_CONFIG_DIR \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3699,13 +3754,14 @@ then : printf "%s\n" "AUTO_SWAP=$with_autoSwap" >&6; } printf "%s\n" "#define AUTO_SWAP \"$with_autoSwap\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AUTO_SWAP=$withval" >&5 printf "%s\n" "AUTO_SWAP=$withval" >&6; } AUTO_SWAP="$withval" printf "%s\n" "#define AUTO_SWAP \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3722,13 +3778,14 @@ then : printf "%s\n" "EXPORT_MODULE=$with_exportedModuleCmd" >&6; } printf "%s\n" "#define EXPORT_MODULE \"$with_exportedModuleCmd\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXPORT_MODULE=$withval" >&5 printf "%s\n" "EXPORT_MODULE=$withval" >&6; } EXPORT_MODULE="$withval" printf "%s\n" "#define EXPORT_MODULE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3743,13 +3800,14 @@ then : printf "%s\n" "REDIRECT=$with_redirect" >&6; } printf "%s\n" "#define REDIRECT \"$with_redirect\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: REDIRECT=$withval" >&5 printf "%s\n" "REDIRECT=$withval" >&6; } REDIRECT="$withval" printf "%s\n" "#define REDIRECT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3761,13 +3819,14 @@ then : printf "%s\n" "MODULEPATH_ROOT=$with_module_root_path" >&6; } printf "%s\n" "#define MODULEPATH_ROOT \"$with_module_root_path\"" >>confdefs.h -else $as_nop - withval="$prefix/modulefiles" +else case e in #( + e) withval="$prefix/modulefiles" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_ROOT=$withval" >&5 printf "%s\n" "MODULEPATH_ROOT=$withval" >&6; } MODULEPATH_ROOT="$withval" printf "%s\n" "#define MODULEPATH_ROOT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3780,13 +3839,14 @@ then : printf "%s\n" "ANCIENT=$with_ancient" >&6; } printf "%s\n" "#define ANCIENT \"$with_ancient\"" >>confdefs.h -else $as_nop - withval="86400" +else case e in #( + e) withval="86400" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ANCIENT=$withval" >&5 printf "%s\n" "ANCIENT=$withval" >&6; } ANCIENT="$withval" printf "%s\n" "#define ANCIENT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3799,13 +3859,14 @@ then : printf "%s\n" "SHORT_TIME=$with_shortTime" >&6; } printf "%s\n" "#define SHORT_TIME \"$with_shortTime\"" >>confdefs.h -else $as_nop - withval="2" +else case e in #( + e) withval="2" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SHORT_TIME=$withval" >&5 printf "%s\n" "SHORT_TIME=$withval" >&6; } SHORT_TIME="$withval" printf "%s\n" "#define SHORT_TIME \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3818,13 +3879,14 @@ then : printf "%s\n" "SPIDER_CACHE_DIRS=$with_spiderCacheDir" >&6; } printf "%s\n" "#define SPIDER_CACHE_DIRS \"$with_spiderCacheDir\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DIRS=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DIRS=$withval" >&6; } SPIDER_CACHE_DIRS="$withval" printf "%s\n" "#define SPIDER_CACHE_DIRS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3837,13 +3899,14 @@ then : printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$with_spiderCacheDescript" >&6; } printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$with_spiderCacheDescript\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DESCRIPT_FN=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$withval" >&6; } SPIDER_CACHE_DESCRIPT_FN="$withval" printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3856,13 +3919,14 @@ then : printf "%s\n" "UPDATE_SYSTEM_FN=$with_updateSystemFn" >&6; } printf "%s\n" "#define UPDATE_SYSTEM_FN \"$with_updateSystemFn\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: UPDATE_SYSTEM_FN=$withval" >&5 printf "%s\n" "UPDATE_SYSTEM_FN=$withval" >&6; } UPDATE_SYSTEM_FN="$withval" printf "%s\n" "#define UPDATE_SYSTEM_FN \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3875,13 +3939,14 @@ then : printf "%s\n" "PREPEND_BLOCK=$with_prependBlock" >&6; } printf "%s\n" "#define PREPEND_BLOCK \"$with_prependBlock\"" >>confdefs.h -else $as_nop - withval="normal" +else case e in #( + e) withval="normal" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PREPEND_BLOCK=$withval" >&5 printf "%s\n" "PREPEND_BLOCK=$withval" >&6; } PREPEND_BLOCK="$withval" printf "%s\n" "#define PREPEND_BLOCK \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3894,13 +3959,14 @@ then : printf "%s\n" "SITE_NAME=$with_siteName" >&6; } printf "%s\n" "#define SITE_NAME \"$with_siteName\"" >>confdefs.h -else $as_nop - withval='' +else case e in #( + e) withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_NAME=$withval" >&5 printf "%s\n" "SITE_NAME=$withval" >&6; } SITE_NAME="$withval" printf "%s\n" "#define SITE_NAME \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3913,13 +3979,14 @@ then : printf "%s\n" "SYSHOST=$with_syshost" >&6; } printf "%s\n" "#define SYSHOST \"$with_syshost\"" >>confdefs.h -else $as_nop - withval='' +else case e in #( + e) withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SYSHOST=$withval" >&5 printf "%s\n" "SYSHOST=$withval" >&6; } SYSHOST="$withval" printf "%s\n" "#define SYSHOST \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3934,13 +4001,14 @@ then : printf "%s\n" "ALLOW_TCL_MFILES==$withval" >&6; } printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ALLOW_TCL_MFILES=$withval" >&5 printf "%s\n" "ALLOW_TCL_MFILES=$withval" >&6; } ALLOW_TCL_MFILES="$withval" printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3955,13 +4023,14 @@ then : printf "%s\n" "DISABLE_NAME_AUTOSWAP==$withval" >&6; } printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DISABLE_NAME_AUTOSWAP=$withval" >&5 printf "%s\n" "DISABLE_NAME_AUTOSWAP=$withval" >&6; } DISABLE_NAME_AUTOSWAP="$withval" printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3976,13 +4045,14 @@ then : printf "%s\n" "MPATH_AVAIL==$withval" >&6; } printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MPATH_AVAIL=$withval" >&5 printf "%s\n" "MPATH_AVAIL=$withval" >&6; } MPATH_AVAIL="$withval" printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3997,13 +4067,14 @@ then : printf "%s\n" "SETTARG=$with_settarg" >&6; } printf "%s\n" "#define SETTARG \"$with_settarg\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SETTARG=$withval" >&5 printf "%s\n" "SETTARG=$withval" >&6; } SETTARG="$withval" printf "%s\n" "#define SETTARG \"$withval\"" >>confdefs.h - + ;; +esac fi DFLT_IGNORE_DIRS=".svn,.git,.hg,.bzr" @@ -4018,13 +4089,14 @@ then : printf "%s\n" "IGNORE_DIRS=$with_ignoreDirs" >&6; } printf "%s\n" "#define IGNORE_DIRS \"$with_ignoreDirs\"" >>confdefs.h -else $as_nop - withval="$DFLT_IGNORE_DIRS" +else case e in #( + e) withval="$DFLT_IGNORE_DIRS" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IGNORE_DIRS=$withval" >&5 printf "%s\n" "IGNORE_DIRS=$withval" >&6; } IGNORE_DIRS="$withval" printf "%s\n" "#define IGNORE_DIRS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4039,13 +4111,14 @@ then : printf "%s\n" "PIN_VERSIONS=$with_pinVersions" >&6; } printf "%s\n" "#define PIN_VERSIONS \"$with_pinVersions\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PIN_VERSIONS=$withval" >&5 printf "%s\n" "PIN_VERSIONS=$withval" >&6; } PIN_VERSIONS="$withval" printf "%s\n" "#define PIN_VERSIONS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4060,13 +4133,14 @@ then : printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$with_downstreamConflicts" >&6; } printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$with_downstreamConflicts\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_DOWNSTREAM_CONFLICTS=$withval" >&5 printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$withval" >&6; } LMOD_DOWNSTREAM_CONFLICTS="$withval" printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4081,13 +4155,14 @@ then : printf "%s\n" "MODULES_AUTO_HANDLING=$with_modulesAutoHandling" >&6; } printf "%s\n" "#define MODULES_AUTO_HANDLING \"$with_modulesAutoHandling\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULES_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULES_AUTO_HANDLING=$withval" >&6; } MODULES_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULES_AUTO_HANDLING \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4102,13 +4177,14 @@ then : printf "%s\n" "TMOD_PATH_RULE=$with_tmodPathRule" >&6; } printf "%s\n" "#define TMOD_PATH_RULE \"$with_tmodPathRule\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_PATH_RULE=$withval" >&5 printf "%s\n" "TMOD_PATH_RULE=$withval" >&6; } TMOD_PATH_RULE="$withval" printf "%s\n" "#define TMOD_PATH_RULE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4123,13 +4199,14 @@ then : printf "%s\n" "TMOD_FIND_FIRST=$with_tmodFindFirst" >&6; } printf "%s\n" "#define TMOD_FIND_FIRST \"$with_tmodFindFirst\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_FIND_FIRST=$withval" >&5 printf "%s\n" "TMOD_FIND_FIRST=$withval" >&6; } TMOD_FIND_FIRST="$withval" printf "%s\n" "#define TMOD_FIND_FIRST \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4142,13 +4219,14 @@ then : printf "%s\n" "LUA_INCLUDE=$with_lua_include" >&6; } printf "%s\n" "#define LUA_INCLUDE \"$with_lua_include\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_INCLUDE=$withval" >&5 printf "%s\n" "LUA_INCLUDE=$withval" >&6; } LUA_INCLUDE="$withval" printf "%s\n" "#define LUA_INCLUDE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4163,13 +4241,14 @@ then : printf "%s\n" "CACHED_LOADS=$with_cachedLoads" >&6; } printf "%s\n" "#define CACHED_LOADS \"$with_cachedLoads\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CACHED_LOADS=$withval" >&5 printf "%s\n" "CACHED_LOADS=$withval" >&6; } CACHED_LOADS="$withval" printf "%s\n" "#define CACHED_LOADS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4184,13 +4263,14 @@ then : printf "%s\n" "EXTENDED_DEFAULT=$with_extendedDefault" >&6; } printf "%s\n" "#define EXTENDED_DEFAULT \"$with_extendedDefault\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXTENDED_DEFAULT=$withval" >&5 printf "%s\n" "EXTENDED_DEFAULT=$withval" >&6; } EXTENDED_DEFAULT="$withval" printf "%s\n" "#define EXTENDED_DEFAULT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4205,13 +4285,14 @@ then : printf "%s\n" "SUPPORT_KSH=$with_supportKsh" >&6; } printf "%s\n" "#define SUPPORT_KSH \"$with_supportKsh\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SUPPORT_KSH=$withval" >&5 printf "%s\n" "SUPPORT_KSH=$withval" >&6; } SUPPORT_KSH="$withval" printf "%s\n" "#define SUPPORT_KSH \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4224,13 +4305,14 @@ then : printf "%s\n" "MODULEPATH_INIT=$with_ModulePathInit" >&6; } printf "%s\n" "#define MODULEPATH_INIT \"$with_ModulePathInit\"" >>confdefs.h -else $as_nop - withval="@PKG@/init/.modulespath" +else case e in #( + e) withval="@PKG@/init/.modulespath" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_INIT=$withval" >&5 printf "%s\n" "MODULEPATH_INIT=$withval" >&6; } MODULEPATH_INIT="$withval" printf "%s\n" "#define MODULEPATH_INIT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4245,13 +4327,14 @@ then : printf "%s\n" "SITE_CONTROLLED_PREFIX=$with_siteControlPrefix" >&6; } printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$with_siteControlPrefix\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_CONTROLLED_PREFIX=$withval" >&5 printf "%s\n" "SITE_CONTROLLED_PREFIX=$withval" >&6; } SITE_CONTROLLED_PREFIX="$withval" printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4266,13 +4349,14 @@ then : printf "%s\n" "USE_BUILT_IN_PKGS=$with_useBuiltinPkgs" >&6; } printf "%s\n" "#define USE_BUILT_IN_PKGS \"$with_useBuiltinPkgs\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_BUILT_IN_PKGS=$withval" >&5 printf "%s\n" "USE_BUILT_IN_PKGS=$withval" >&6; } USE_BUILT_IN_PKGS="$withval" printf "%s\n" "#define USE_BUILT_IN_PKGS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4287,13 +4371,14 @@ then : printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$with_useDotConfigDirOnly" >&6; } printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$with_useDotConfigDirOnly\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_DOT_CONFIG_DIR_ONLY=$withval" >&5 printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$withval" >&6; } USE_DOT_CONFIG_DIR_ONLY="$withval" printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4308,13 +4393,14 @@ then : printf "%s\n" "SILENCE_SHELL_DEBUGGING=$with_silentShellDebugging" >&6; } printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$with_silentShellDebugging\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SILENCE_SHELL_DEBUGGING=$withval" >&5 printf "%s\n" "SILENCE_SHELL_DEBUGGING=$withval" >&6; } SILENCE_SHELL_DEBUGGING="$withval" printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4329,13 +4415,14 @@ then : printf "%s\n" "FAST_TCL_INTERP=$with_fastTCLInterp" >&6; } printf "%s\n" "#define FAST_TCL_INTERP \"$with_fastTCLInterp\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FAST_TCL_INTERP=$withval" >&5 printf "%s\n" "FAST_TCL_INTERP=$withval" >&6; } FAST_TCL_INTERP="$withval" printf "%s\n" "#define FAST_TCL_INTERP \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4350,13 +4437,14 @@ then : printf "%s\n" "MODULE_AUTO_HANDLING=$with-moduleAutoHandling" >&6; } printf "%s\n" "#define MODULE_AUTO_HANDLING \"$with-moduleAutoHandling\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULE_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULE_AUTO_HANDLING=$withval" >&6; } MODULE_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULE_AUTO_HANDLING \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4371,13 +4459,14 @@ then : printf "%s\n" "AVAIL_EXTENSIONS=$with_availExtensions" >&6; } printf "%s\n" "#define AVAIL_EXTENSIONS \"$with_availExtensions\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AVAIL_EXTENSIONS=$withval" >&5 printf "%s\n" "AVAIL_EXTENSIONS=$withval" >&6; } AVAIL_EXTENSIONS="$withval" printf "%s\n" "#define AVAIL_EXTENSIONS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4395,13 +4484,14 @@ then : printf "%s\n" "PATH_TO_LUA=$with_lua" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$with_lua\"" >>confdefs.h -else $as_nop - withval="lua" +else case e in #( + e) withval="lua" PATH_TO_LUA="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$withval" >&5 printf "%s\n" "PATH_TO_LUA=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4419,13 +4509,14 @@ then : printf "%s\n" "PATH_TO_LUAC=$with_luac" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$with_luac\"" >>confdefs.h -else $as_nop - withval="luac" +else case e in #( + e) withval="luac" PATH_TO_LUAC="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$withval" >&5 printf "%s\n" "PATH_TO_LUAC=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4440,13 +4531,14 @@ then : printf "%s\n" "LUA_SUFFIX=$with_luaSuffic" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$with_luaSuffix\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" LUA_SUFFIX="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_SUFFIX=$withval" >&5 printf "%s\n" "LUA_SUFFIX=$withval" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$withval\"" >>confdefs.h - + ;; +esac fi if test "$ALLOW_TCL_MFILES" = no ; then @@ -4475,8 +4567,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else $as_nop - case $pkgConfig in +else case e in #( + e) case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -4502,6 +4594,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; +esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -4558,8 +4651,8 @@ then : printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "tcl.hh" "ac_cv_header_tcl_hh" "$ac_includes_default" -if test "x$ac_cv_header_tcl_hh" = xyes +ac_fn_c_check_header_compile "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default" +if test "x$ac_cv_header_tcl_h" = xyes then : printf "%s\n" "#define HAVE_TCL_H 1" >>confdefs.h @@ -4580,15 +4673,21 @@ printf %s "checking for library containing Tcl_CreateInterp... " >&6; } if test ${ac_cv_search_Tcl_CreateInterp+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char Tcl_CreateInterp (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char Tcl_CreateInterp (void); int main (void) { @@ -4619,11 +4718,13 @@ done if test ${ac_cv_search_Tcl_CreateInterp+y} then : -else $as_nop - ac_cv_search_Tcl_CreateInterp=no +else case e in #( + e) ac_cv_search_Tcl_CreateInterp=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_Tcl_CreateInterp" >&5 printf "%s\n" "$ac_cv_search_Tcl_CreateInterp" >&6; } @@ -4632,8 +4733,9 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop - rm -f makefile; as_fn_error $? "Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" "$LINENO" 5 +else case e in #( + e) rm -f makefile; as_fn_error $? "Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" "$LINENO" 5 ;; +esac fi @@ -4666,14 +4768,6 @@ PATH_TO_SRC=$SRCDIR -FOUND_ERROR=yes -MSG="MODE must have at least one executable bit set (Not MODE=$MODE)| -Please try setting mode to 755 or 750 or 700 or similar." - - echo "$MSG" - echo -ERR_MSG="$ERR_MSG||$MSG" - if test $MODE == "user_default" ; then mode=0755 EXEC_BITS=$(( 0111 & $mode )); @@ -4698,8 +4792,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PS+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PS in +else case e in #( + e) case $PS in [\\/]* | ?:[\\/]*) ac_cv_path_PS="$PS" # Let the user override the test with a path. ;; @@ -4725,6 +4819,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PS" && ac_cv_path_PS="UNKNOWN_PS" ;; +esac ;; esac fi PS=$ac_cv_path_PS @@ -4752,8 +4847,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_READLINK+y} then : printf %s "(cached) " >&6 -else $as_nop - case $READLINK in +else case e in #( + e) case $READLINK in [\\/]* | ?:[\\/]*) ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path. ;; @@ -4779,6 +4874,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_READLINK" && ac_cv_path_READLINK="UNKNOWN_READLINK" ;; +esac ;; esac fi READLINK=$ac_cv_path_READLINK @@ -4808,8 +4904,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_EXPR+y} then : printf %s "(cached) " >&6 -else $as_nop - case $EXPR in +else case e in #( + e) case $EXPR in [\\/]* | ?:[\\/]*) ac_cv_path_EXPR="$EXPR" # Let the user override the test with a path. ;; @@ -4834,6 +4930,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi EXPR=$ac_cv_path_EXPR @@ -4867,8 +4964,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BASENAME+y} then : printf %s "(cached) " >&6 -else $as_nop - case $BASENAME in +else case e in #( + e) case $BASENAME in [\\/]* | ?:[\\/]*) ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path. ;; @@ -4893,6 +4990,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi BASENAME=$ac_cv_path_BASENAME @@ -4926,8 +5024,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BC+y} then : printf %s "(cached) " >&6 -else $as_nop - case $BC in +else case e in #( + e) case $BC in [\\/]* | ?:[\\/]*) ac_cv_path_BC="$BC" # Let the user override the test with a path. ;; @@ -4952,6 +5050,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi BC=$ac_cv_path_BC @@ -4983,8 +5082,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_POD2MAN+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_POD2MAN in +else case e in #( + e) case $PATH_TO_POD2MAN in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_POD2MAN="$PATH_TO_POD2MAN" # Let the user override the test with a path. ;; @@ -5010,6 +5109,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_POD2MAN" && ac_cv_path_PATH_TO_POD2MAN="UNKNOWN_POD2MAN" ;; +esac ;; esac fi PATH_TO_POD2MAN=$ac_cv_path_PATH_TO_POD2MAN @@ -5030,8 +5130,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_GIT+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_GIT in +else case e in #( + e) case $PATH_TO_GIT in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_GIT="$PATH_TO_GIT" # Let the user override the test with a path. ;; @@ -5057,6 +5157,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_GIT" && ac_cv_path_PATH_TO_GIT="""" ;; +esac ;; esac fi PATH_TO_GIT=$ac_cv_path_PATH_TO_GIT @@ -5078,8 +5179,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_PAGER+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_PAGER in +else case e in #( + e) case $PATH_TO_PAGER in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_PAGER="$PATH_TO_PAGER" # Let the user override the test with a path. ;; @@ -5104,6 +5205,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PATH_TO_PAGER=$ac_cv_path_PATH_TO_PAGER @@ -5130,8 +5232,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_HASHSUM+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_HASHSUM in +else case e in #( + e) case $PATH_TO_HASHSUM in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_HASHSUM="$PATH_TO_HASHSUM" # Let the user override the test with a path. ;; @@ -5156,6 +5258,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PATH_TO_HASHSUM=$ac_cv_path_PATH_TO_HASHSUM @@ -5189,8 +5292,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TCLSH+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_TCLSH in +else case e in #( + e) case $PATH_TO_TCLSH in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TCLSH="$PATH_TO_TCLSH" # Let the user override the test with a path. ;; @@ -5216,6 +5319,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_TCLSH" && ac_cv_path_PATH_TO_TCLSH="UNKNOWN_TCLSH" ;; +esac ;; esac fi PATH_TO_TCLSH=$ac_cv_path_PATH_TO_TCLSH @@ -5244,8 +5348,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TR+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_TR in +else case e in #( + e) case $PATH_TO_TR in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TR="$PATH_TO_TR" # Let the user override the test with a path. ;; @@ -5270,6 +5374,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PATH_TO_TR=$ac_cv_path_PATH_TO_TR @@ -5295,8 +5400,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_LS+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_LS in +else case e in #( + e) case $PATH_TO_LS in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_LS="$PATH_TO_LS" # Let the user override the test with a path. ;; @@ -5321,6 +5426,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PATH_TO_LS=$ac_cv_path_PATH_TO_LS @@ -5386,8 +5492,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUA+y} then : printf %s "(cached) " >&6 -else $as_nop - case $FIND_PATH_TO_LUA in +else case e in #( + e) case $FIND_PATH_TO_LUA in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUA="$FIND_PATH_TO_LUA" # Let the user override the test with a path. ;; @@ -5412,6 +5518,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi FIND_PATH_TO_LUA=$ac_cv_path_FIND_PATH_TO_LUA @@ -5441,8 +5548,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUAC+y} then : printf %s "(cached) " >&6 -else $as_nop - case $FIND_PATH_TO_LUAC in +else case e in #( + e) case $FIND_PATH_TO_LUAC in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUAC="$FIND_PATH_TO_LUAC" # Let the user override the test with a path. ;; @@ -5467,6 +5574,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi FIND_PATH_TO_LUAC=$ac_cv_path_FIND_PATH_TO_LUAC @@ -5613,8 +5721,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else $as_nop - case $pkgConfig in +else case e in #( + e) case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -5640,6 +5748,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; +esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -5709,8 +5818,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ZSH+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ZSH in +else case e in #( + e) case $ZSH in [\\/]* | ?:[\\/]*) ac_cv_path_ZSH="$ZSH" # Let the user override the test with a path. ;; @@ -5735,6 +5844,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ZSH=$ac_cv_path_ZSH @@ -5818,8 +5928,8 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the +# 'ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* 'ac_cv_foo' will be assigned the # following values. _ACEOF @@ -5849,14 +5959,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote + # 'set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # `set' quotes correctly as required by POSIX, so do not add quotes. + # 'set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -5920,9 +6030,7 @@ s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g t quote b any :quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g +s/[][ `~#$^&*(){}\\|;'\''"<>?]/\\&/g s/\$/$$/g H :any @@ -5982,7 +6090,6 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -5991,12 +6098,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi @@ -6068,7 +6176,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -6097,7 +6205,6 @@ as_fn_error () } # as_fn_error - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -6137,11 +6244,12 @@ then : { eval $1+=\$2 }' -else $as_nop - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -6155,11 +6263,12 @@ then : { as_val=$(( $* )) }' -else $as_nop - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith @@ -6242,9 +6351,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -6325,10 +6434,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated exec 6>&1 @@ -6344,7 +6455,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.71. Invocation command line was +generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6371,7 +6482,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions +'$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -6399,10 +6510,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.71, +configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -6459,8 +6570,8 @@ do ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: '$1' +Try '$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -6510,7 +6621,7 @@ do case $ac_config_target in "makefile") CONFIG_FILES="$CONFIG_FILES makefile:Makefile.in" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; esac done @@ -6528,7 +6639,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. +# after its creation but before its name has been assigned to '$tmp'. $debug || { tmp= ac_tmp= @@ -6552,7 +6663,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. +# This happens for instance with './config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -6718,7 +6829,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6740,19 +6851,19 @@ do -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. + # because $ac_f cannot contain ':'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is `configure' which instantiates (i.e., don't + # Let's still pretend it is 'configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` @@ -6876,7 +6987,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when `$srcdir' = `.'. +# Neutralize VPATH when '$srcdir' = '.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -6905,9 +7016,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" diff --git a/configure.ac b/configure.ac index 164a0e0bb..9f93b27b9 100644 --- a/configure.ac +++ b/configure.ac @@ -730,7 +730,7 @@ if test "$FAST_TCL_INTERP" = yes ; then CPPFLAGS="$TCL_INCLUDE" - AC_CHECK_HEADER(tcl.hh, + AC_CHECK_HEADER(tcl.h, [AC_DEFINE([HAVE_TCL_H], 1, [Define to 1 if you have tcl.h])],[]) if test "$ac_cv_header_tcl_h" != yes ; then @@ -770,14 +770,6 @@ AC_SUBST(PATH_TO_HASHSUM) AC_SUBST(PATH_TO_PAGER) AC_SUBST(PATH_TO_TCLSH) -FOUND_ERROR=yes -MSG="MODE must have at least one executable bit set (Not MODE=$MODE)| -Please try setting mode to 755 or 750 or 700 or similar." - - echo "$MSG" - echo -ERR_MSG="$ERR_MSG||$MSG" - if test $MODE == "user_default" ; then mode=0755 EXEC_BITS=$(( 0111 & $mode )); From a868e5d3fea446ff5dc905731a481b283e8a6822 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 1 Aug 2024 09:13:07 -0500 Subject: [PATCH 050/198] update configure to report all errors before quiting --- configure | 995 ++++++++++++++++++++++++++++----------------------- configure.ac | 10 +- 2 files changed, 554 insertions(+), 451 deletions(-) diff --git a/configure b/configure index fbf0d484a..32ad3975c 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71. +# Generated by GNU Autoconf 2.72. # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, # Inc. # # @@ -15,7 +15,6 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -24,12 +23,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi @@ -101,7 +101,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -131,15 +131,14 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. +# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh NULLCMD=: @@ -147,12 +146,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else \$as_nop - case \`(set -o) 2>/dev/null\` in #( +else case e in #( + e) case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi " @@ -170,8 +170,9 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : -else \$as_nop - exitcode=1; echo positional parameters were not saved. +else case e in #( + e) exitcode=1; echo positional parameters were not saved. ;; +esac fi test x\$exitcode = x0 || exit 1 blah=\$(echo \$(echo blah)) @@ -184,14 +185,15 @@ test -x / || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes -else $as_nop - as_have_required=no +else case e in #( + e) as_have_required=no ;; +esac fi if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null then : -else $as_nop - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else case e in #( + e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do @@ -224,12 +226,13 @@ IFS=$as_save_IFS if $as_found then : -else $as_nop - if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +else case e in #( + e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null then : CONFIG_SHELL=$SHELL as_have_required=yes -fi +fi ;; +esac fi @@ -251,7 +254,7 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. +# out after a failed 'exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -270,7 +273,8 @@ $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." fi exit 1 -fi +fi ;; +esac fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -309,14 +313,6 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -385,11 +381,12 @@ then : { eval $1+=\$2 }' -else $as_nop - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -403,21 +400,14 @@ then : { as_val=$(( $* )) }' -else $as_nop - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -491,6 +481,8 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' + t clear + :clear s/[$]LINENO.*/&-/ t lineno b @@ -539,7 +531,6 @@ esac as_echo='printf %s\n' as_echo_n='printf %s' - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -551,9 +542,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -578,10 +569,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated test -n "$DJDIR" || exec 7<&0 /dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -964,7 +957,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1177,7 +1170,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1193,7 +1186,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: '$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1223,8 +1216,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: '$ac_option' +Try '$0 --help' for more information" ;; *=*) @@ -1232,7 +1225,7 @@ Try \`$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: '$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1282,7 +1275,7 @@ do as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: `$host' +# There might be people who depend on the old broken behavior: '$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -1350,7 +1343,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -1378,7 +1371,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +'configure' configures this package to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1392,11 +1385,11 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages + -q, --quiet, --silent do not print 'checking ...' messages --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' + -C, --config-cache alias for '--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] + --srcdir=DIR find the sources in DIR [configure dir or '..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1404,10 +1397,10 @@ Installation directories: --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. +By default, 'make install' will install all the files in +'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify +an installation prefix other than '$ac_default_prefix' using '--prefix', +for instance '--prefix=\$HOME'. For better control, use the options below. @@ -1546,7 +1539,7 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory -Use these variables to override the choices made by `configure' or to help +Use these variables to override the choices made by 'configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to the package provider. @@ -1614,9 +1607,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.71 +generated by GNU Autoconf 2.72 -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1655,11 +1648,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1678,8 +1672,8 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> @@ -1687,10 +1681,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else $as_nop - eval "$3=no" +else case e in #( + e) eval "$3=no" ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -1730,11 +1726,12 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 + ac_retval=1 ;; +esac fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -1770,7 +1767,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.71. Invocation command line was +generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -2016,10 +2013,10 @@ esac printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } fi done @@ -2055,9 +2052,7 @@ struct stat; /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; +static char *e (char **p, int i) { return p[i]; } @@ -2071,6 +2066,21 @@ static char *f (char * (*g) (char **, int), char **p, ...) return s; } +/* C89 style stringification. */ +#define noexpand_stringify(a) #a +const char *stringified = noexpand_stringify(arbitrary+token=sequence); + +/* C89 style token pasting. Exercises some of the corner cases that + e.g. old MSVC gets wrong, but not very hard. */ +#define noexpand_concat(a,b) a##b +#define expand_concat(a,b) noexpand_concat(a,b) +extern int vA; +extern int vbee; +#define aye A +#define bee B +int *pvA = &expand_concat(v,aye); +int *pvbee = &noexpand_concat(v,bee); + /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not \xHH hex character constants. These do not provoke an error unfortunately, instead are silently treated @@ -2098,16 +2108,19 @@ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); # Test code for whether the C compiler supports C99 (global declarations) ac_c_conftest_c99_globals=' -// Does the compiler advertise C99 conformance? +/* Does the compiler advertise C99 conformance? */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L # error "Compiler does not advertise C99 conformance" #endif +// See if C++-style comments work. + #include extern int puts (const char *); extern int printf (const char *, ...); extern int dprintf (int, const char *, ...); extern void *malloc (size_t); +extern void free (void *); // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare @@ -2157,7 +2170,6 @@ typedef const char *ccp; static inline int test_restrict (ccp restrict text) { - // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) @@ -2223,6 +2235,8 @@ ac_c_conftest_c99_main=' ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; + // Work around memory leak warnings. + free (ia); // Check named initializers. struct named_init ni = { @@ -2244,7 +2258,7 @@ ac_c_conftest_c99_main=' # Test code for whether the C compiler supports C11 (global declarations) ac_c_conftest_c11_globals=' -// Does the compiler advertise C11 conformance? +/* Does the compiler advertise C11 conformance? */ #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L # error "Compiler does not advertise C11 conformance" #endif @@ -2367,12 +2381,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2381,18 +2395,18 @@ printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -2408,11 +2422,11 @@ printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## @@ -2450,8 +2464,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2473,7 +2487,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2495,8 +2510,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2518,7 +2533,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2553,8 +2569,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2576,7 +2592,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2598,8 +2615,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -2638,7 +2655,8 @@ if test $ac_prog_rejected = yes; then ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2662,8 +2680,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2685,7 +2703,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2711,8 +2730,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2734,7 +2753,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2772,8 +2792,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then +else case e in #( + e) if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2795,7 +2815,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2817,8 +2838,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then +else case e in #( + e) if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2840,7 +2861,8 @@ done done IFS=$as_save_IFS -fi +fi ;; +esac fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2869,10 +2891,10 @@ fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2944,8 +2966,8 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. +# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -2965,7 +2987,7 @@ do ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' + # safe: cross compilers may not add the suffix if given an '-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -2976,8 +2998,9 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else $as_nop - ac_file='' +else case e in #( + e) ac_file='' ;; +esac fi if test -z "$ac_file" then : @@ -2986,13 +3009,14 @@ printf "%s\n" "no" >&6; } printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +See 'config.log' for more details" "$LINENO" 5; } +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 printf %s "checking for C compiler default output file name... " >&6; } @@ -3016,10 +3040,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. + # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) +# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will +# work properly (i.e., refer to 'conftest.exe'), while it won't with +# 'rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -3029,11 +3053,12 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else case e in #( + e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi rm -f conftest conftest$ac_cv_exeext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3049,6 +3074,8 @@ int main (void) { FILE *f = fopen ("conftest.out", "w"); + if (!f) + return 1; return ferror (f) || fclose (f) != 0; ; @@ -3088,26 +3115,27 @@ printf "%s\n" "$ac_try_echo"; } >&5 if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use '--host'. +See 'config.log' for more details" "$LINENO" 5; } fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +rm -f conftest.$ac_ext conftest$ac_cv_exeext \ + conftest.o conftest.obj conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } if test ${ac_cv_objext+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3139,16 +3167,18 @@ then : break;; esac done -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else case e in #( + e) printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +See 'config.log' for more details" "$LINENO" 5; } ;; +esac fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext +rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 printf "%s\n" "$ac_cv_objext" >&6; } @@ -3159,8 +3189,8 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } if test ${ac_cv_c_compiler_gnu+y} then : printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else case e in #( + e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3177,12 +3207,14 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes -else $as_nop - ac_compiler_gnu=no +else case e in #( + e) ac_compiler_gnu=no ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - + ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } @@ -3200,8 +3232,8 @@ printf %s "checking whether $CC accepts -g... " >&6; } if test ${ac_cv_prog_cc_g+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_save_c_werror_flag=$ac_c_werror_flag +else case e in #( + e) ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -3219,8 +3251,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes -else $as_nop - CFLAGS="" +else case e in #( + e) CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3235,8 +3267,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else $as_nop - ac_c_werror_flag=$ac_save_c_werror_flag +else case e in #( + e) ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3253,12 +3285,15 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; +esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag + ac_c_werror_flag=$ac_save_c_werror_flag ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 printf "%s\n" "$ac_cv_prog_cc_g" >&6; } @@ -3285,8 +3320,8 @@ printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c11=no +else case e in #( + e) ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3303,25 +3338,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" + CC="$CC $ac_cv_prog_cc_c11" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 + ac_prog_cc_stdc=c11 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -3331,8 +3369,8 @@ printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c99=no +else case e in #( + e) ac_cv_prog_cc_c99=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3349,25 +3387,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c99" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" + CC="$CC $ac_cv_prog_cc_c99" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 + ac_prog_cc_stdc=c99 ;; +esac fi fi if test x$ac_prog_cc_stdc = xno @@ -3377,8 +3418,8 @@ printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c89=no +else case e in #( + e) ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3395,25 +3436,28 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC +CC=$ac_save_CC ;; +esac fi if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x +else case e in #( + e) if test "x$ac_cv_prog_cc_c89" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +else case e in #( + e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" + CC="$CC $ac_cv_prog_cc_c89" ;; +esac fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 + ac_prog_cc_stdc=c89 ;; +esac fi fi @@ -3475,13 +3519,14 @@ then : printf "%s\n" "DUPLICATE_PATHS=$with_duplicatePaths" >&6; } printf "%s\n" "#define DUPLICATE_PATHS \"$with_duplicatePaths\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DUPLICATE_PATHS=$withval" >&5 printf "%s\n" "DUPLICATE_PATHS=$withval" >&6; } DUPLICATE_PATHS="$withval" printf "%s\n" "#define DUPLICATE_PATHS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3496,13 +3541,14 @@ then : printf "%s\n" "LMOD_ALLOW_ROOT_USE=$with_allowRootUse" >&6; } printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$with_allowRootUse\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_ALLOW_ROOT_USE=$withval" >&5 printf "%s\n" "LMOD_ALLOW_ROOT_USE=$withval" >&6; } LMOD_ALLOW_ROOT_USE="$withval" printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3515,13 +3561,14 @@ then : printf "%s\n" "SITE_MSG_FILE=$with_siteMsgFile" >&6; } printf "%s\n" "#define SITE_MSG_FILE \"$with_siteMsgFile\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_MSG_FILE=$withval" >&5 printf "%s\n" "SITE_MSG_FILE=$withval" >&6; } SITE_MSG_FILE="$withval" printf "%s\n" "#define SITE_MSG_FILE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3534,13 +3581,14 @@ then : printf "%s\n" "LMOD_OVERRIDE_LANG=$with_lang" >&6; } printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$with_lang\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_OVERRIDE_LANG=$withval" >&5 printf "%s\n" "LMOD_OVERRIDE_LANG=$withval" >&6; } LMOD_OVERRIDE_LANG="$withval" printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3555,13 +3603,14 @@ then : printf "%s\n" "CASE_INDEPENDENT_SORTING=$with_caseIndependentSorting" >&6; } printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$with_caseIndependentSorting\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CASE_INDEPENDENT_SORTING=$withval" >&5 printf "%s\n" "CASE_INDEPENDENT_SORTING=$withval" >&6; } CASE_INDEPENDENT_SORTING="$withval" printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3576,13 +3625,14 @@ then : printf "%s\n" "COLORIZE=$with_colorize" >&6; } printf "%s\n" "#define COLORIZE \"$with_colorize\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: COLORIZE=$withval" >&5 printf "%s\n" "COLORIZE=$withval" >&6; } COLORIZE="$withval" printf "%s\n" "#define COLORIZE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3597,13 +3647,14 @@ then : printf "%s\n" "DYNAMIC_SPIDER_CACHE=$with_dynamicSpiderCache" >&6; } printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$with_dynamicSpiderCache\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DYNAMIC_SPIDER_CACHE=$withval" >&5 printf "%s\n" "DYNAMIC_SPIDER_CACHE=$withval" >&6; } DYNAMIC_SPIDER_CACHE="$withval" printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3618,13 +3669,14 @@ then : printf "%s\n" "HIDDEN_ITALIC=$with_hiddenItalic" >&6; } printf "%s\n" "#define HIDDEN_ITALIC \"$with_hiddenItalic\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HIDDEN_ITALIC=$withval" >&5 printf "%s\n" "HIDDEN_ITALIC=$withval" >&6; } HIDDEN_ITALIC="$withval" printf "%s\n" "#define HIDDEN_ITALIC \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3639,13 +3691,14 @@ then : printf "%s\n" "EXACT_MATCH=$with_exactMatch" >&6; } printf "%s\n" "#define EXACT_MATCH \"$with_exactMatch\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXACT_MATCH=$withval" >&5 printf "%s\n" "EXACT_MATCH=$withval" >&6; } EXACT_MATCH="$withval" printf "%s\n" "#define EXACT_MATCH \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3659,13 +3712,14 @@ then : printf "%s\n" "MODE=$with_mode" >&6; } printf "%s\n" "#define MODE \"$with_mode\"" >>confdefs.h -else $as_nop - withval="user_default" +else case e in #( + e) withval="user_default" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODE=$withval" >&5 printf "%s\n" "MODE=$withval" >&6; } MODE="$withval" printf "%s\n" "#define MODE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3678,13 +3732,14 @@ then : printf "%s\n" "LMOD_CONFIG_DIR=$with_lmodConfigDir" >&6; } printf "%s\n" "#define LMOD_CONFIG_DIR \"$with_lmodConfigDir\"" >>confdefs.h -else $as_nop - withval="/etc/lmod" +else case e in #( + e) withval="/etc/lmod" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_CONFIG_DIR=$withval" >&5 printf "%s\n" "LMOD_CONFIG_DIR=$withval" >&6; } LMOD_CONFIG_DIR="$withval" printf "%s\n" "#define LMOD_CONFIG_DIR \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3699,13 +3754,14 @@ then : printf "%s\n" "AUTO_SWAP=$with_autoSwap" >&6; } printf "%s\n" "#define AUTO_SWAP \"$with_autoSwap\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AUTO_SWAP=$withval" >&5 printf "%s\n" "AUTO_SWAP=$withval" >&6; } AUTO_SWAP="$withval" printf "%s\n" "#define AUTO_SWAP \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3722,13 +3778,14 @@ then : printf "%s\n" "EXPORT_MODULE=$with_exportedModuleCmd" >&6; } printf "%s\n" "#define EXPORT_MODULE \"$with_exportedModuleCmd\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXPORT_MODULE=$withval" >&5 printf "%s\n" "EXPORT_MODULE=$withval" >&6; } EXPORT_MODULE="$withval" printf "%s\n" "#define EXPORT_MODULE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3743,13 +3800,14 @@ then : printf "%s\n" "REDIRECT=$with_redirect" >&6; } printf "%s\n" "#define REDIRECT \"$with_redirect\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: REDIRECT=$withval" >&5 printf "%s\n" "REDIRECT=$withval" >&6; } REDIRECT="$withval" printf "%s\n" "#define REDIRECT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3761,13 +3819,14 @@ then : printf "%s\n" "MODULEPATH_ROOT=$with_module_root_path" >&6; } printf "%s\n" "#define MODULEPATH_ROOT \"$with_module_root_path\"" >>confdefs.h -else $as_nop - withval="$prefix/modulefiles" +else case e in #( + e) withval="$prefix/modulefiles" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_ROOT=$withval" >&5 printf "%s\n" "MODULEPATH_ROOT=$withval" >&6; } MODULEPATH_ROOT="$withval" printf "%s\n" "#define MODULEPATH_ROOT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3780,13 +3839,14 @@ then : printf "%s\n" "ANCIENT=$with_ancient" >&6; } printf "%s\n" "#define ANCIENT \"$with_ancient\"" >>confdefs.h -else $as_nop - withval="86400" +else case e in #( + e) withval="86400" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ANCIENT=$withval" >&5 printf "%s\n" "ANCIENT=$withval" >&6; } ANCIENT="$withval" printf "%s\n" "#define ANCIENT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3799,13 +3859,14 @@ then : printf "%s\n" "SHORT_TIME=$with_shortTime" >&6; } printf "%s\n" "#define SHORT_TIME \"$with_shortTime\"" >>confdefs.h -else $as_nop - withval="2" +else case e in #( + e) withval="2" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SHORT_TIME=$withval" >&5 printf "%s\n" "SHORT_TIME=$withval" >&6; } SHORT_TIME="$withval" printf "%s\n" "#define SHORT_TIME \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3818,13 +3879,14 @@ then : printf "%s\n" "SPIDER_CACHE_DIRS=$with_spiderCacheDir" >&6; } printf "%s\n" "#define SPIDER_CACHE_DIRS \"$with_spiderCacheDir\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DIRS=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DIRS=$withval" >&6; } SPIDER_CACHE_DIRS="$withval" printf "%s\n" "#define SPIDER_CACHE_DIRS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3837,13 +3899,14 @@ then : printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$with_spiderCacheDescript" >&6; } printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$with_spiderCacheDescript\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DESCRIPT_FN=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$withval" >&6; } SPIDER_CACHE_DESCRIPT_FN="$withval" printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3856,13 +3919,14 @@ then : printf "%s\n" "UPDATE_SYSTEM_FN=$with_updateSystemFn" >&6; } printf "%s\n" "#define UPDATE_SYSTEM_FN \"$with_updateSystemFn\"" >>confdefs.h -else $as_nop - withval="" +else case e in #( + e) withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: UPDATE_SYSTEM_FN=$withval" >&5 printf "%s\n" "UPDATE_SYSTEM_FN=$withval" >&6; } UPDATE_SYSTEM_FN="$withval" printf "%s\n" "#define UPDATE_SYSTEM_FN \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3875,13 +3939,14 @@ then : printf "%s\n" "PREPEND_BLOCK=$with_prependBlock" >&6; } printf "%s\n" "#define PREPEND_BLOCK \"$with_prependBlock\"" >>confdefs.h -else $as_nop - withval="normal" +else case e in #( + e) withval="normal" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PREPEND_BLOCK=$withval" >&5 printf "%s\n" "PREPEND_BLOCK=$withval" >&6; } PREPEND_BLOCK="$withval" printf "%s\n" "#define PREPEND_BLOCK \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3894,13 +3959,14 @@ then : printf "%s\n" "SITE_NAME=$with_siteName" >&6; } printf "%s\n" "#define SITE_NAME \"$with_siteName\"" >>confdefs.h -else $as_nop - withval='' +else case e in #( + e) withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_NAME=$withval" >&5 printf "%s\n" "SITE_NAME=$withval" >&6; } SITE_NAME="$withval" printf "%s\n" "#define SITE_NAME \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3913,13 +3979,14 @@ then : printf "%s\n" "SYSHOST=$with_syshost" >&6; } printf "%s\n" "#define SYSHOST \"$with_syshost\"" >>confdefs.h -else $as_nop - withval='' +else case e in #( + e) withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SYSHOST=$withval" >&5 printf "%s\n" "SYSHOST=$withval" >&6; } SYSHOST="$withval" printf "%s\n" "#define SYSHOST \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3934,13 +4001,14 @@ then : printf "%s\n" "ALLOW_TCL_MFILES==$withval" >&6; } printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ALLOW_TCL_MFILES=$withval" >&5 printf "%s\n" "ALLOW_TCL_MFILES=$withval" >&6; } ALLOW_TCL_MFILES="$withval" printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3955,13 +4023,14 @@ then : printf "%s\n" "DISABLE_NAME_AUTOSWAP==$withval" >&6; } printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DISABLE_NAME_AUTOSWAP=$withval" >&5 printf "%s\n" "DISABLE_NAME_AUTOSWAP=$withval" >&6; } DISABLE_NAME_AUTOSWAP="$withval" printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3976,13 +4045,14 @@ then : printf "%s\n" "MPATH_AVAIL==$withval" >&6; } printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MPATH_AVAIL=$withval" >&5 printf "%s\n" "MPATH_AVAIL=$withval" >&6; } MPATH_AVAIL="$withval" printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -3997,13 +4067,14 @@ then : printf "%s\n" "SETTARG=$with_settarg" >&6; } printf "%s\n" "#define SETTARG \"$with_settarg\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SETTARG=$withval" >&5 printf "%s\n" "SETTARG=$withval" >&6; } SETTARG="$withval" printf "%s\n" "#define SETTARG \"$withval\"" >>confdefs.h - + ;; +esac fi DFLT_IGNORE_DIRS=".svn,.git,.hg,.bzr" @@ -4018,13 +4089,14 @@ then : printf "%s\n" "IGNORE_DIRS=$with_ignoreDirs" >&6; } printf "%s\n" "#define IGNORE_DIRS \"$with_ignoreDirs\"" >>confdefs.h -else $as_nop - withval="$DFLT_IGNORE_DIRS" +else case e in #( + e) withval="$DFLT_IGNORE_DIRS" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IGNORE_DIRS=$withval" >&5 printf "%s\n" "IGNORE_DIRS=$withval" >&6; } IGNORE_DIRS="$withval" printf "%s\n" "#define IGNORE_DIRS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4039,13 +4111,14 @@ then : printf "%s\n" "PIN_VERSIONS=$with_pinVersions" >&6; } printf "%s\n" "#define PIN_VERSIONS \"$with_pinVersions\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PIN_VERSIONS=$withval" >&5 printf "%s\n" "PIN_VERSIONS=$withval" >&6; } PIN_VERSIONS="$withval" printf "%s\n" "#define PIN_VERSIONS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4060,13 +4133,14 @@ then : printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$with_downstreamConflicts" >&6; } printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$with_downstreamConflicts\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_DOWNSTREAM_CONFLICTS=$withval" >&5 printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$withval" >&6; } LMOD_DOWNSTREAM_CONFLICTS="$withval" printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4081,13 +4155,14 @@ then : printf "%s\n" "MODULES_AUTO_HANDLING=$with_modulesAutoHandling" >&6; } printf "%s\n" "#define MODULES_AUTO_HANDLING \"$with_modulesAutoHandling\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULES_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULES_AUTO_HANDLING=$withval" >&6; } MODULES_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULES_AUTO_HANDLING \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4102,13 +4177,14 @@ then : printf "%s\n" "TMOD_PATH_RULE=$with_tmodPathRule" >&6; } printf "%s\n" "#define TMOD_PATH_RULE \"$with_tmodPathRule\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_PATH_RULE=$withval" >&5 printf "%s\n" "TMOD_PATH_RULE=$withval" >&6; } TMOD_PATH_RULE="$withval" printf "%s\n" "#define TMOD_PATH_RULE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4123,13 +4199,14 @@ then : printf "%s\n" "TMOD_FIND_FIRST=$with_tmodFindFirst" >&6; } printf "%s\n" "#define TMOD_FIND_FIRST \"$with_tmodFindFirst\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_FIND_FIRST=$withval" >&5 printf "%s\n" "TMOD_FIND_FIRST=$withval" >&6; } TMOD_FIND_FIRST="$withval" printf "%s\n" "#define TMOD_FIND_FIRST \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4142,13 +4219,14 @@ then : printf "%s\n" "LUA_INCLUDE=$with_lua_include" >&6; } printf "%s\n" "#define LUA_INCLUDE \"$with_lua_include\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_INCLUDE=$withval" >&5 printf "%s\n" "LUA_INCLUDE=$withval" >&6; } LUA_INCLUDE="$withval" printf "%s\n" "#define LUA_INCLUDE \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4163,13 +4241,14 @@ then : printf "%s\n" "CACHED_LOADS=$with_cachedLoads" >&6; } printf "%s\n" "#define CACHED_LOADS \"$with_cachedLoads\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CACHED_LOADS=$withval" >&5 printf "%s\n" "CACHED_LOADS=$withval" >&6; } CACHED_LOADS="$withval" printf "%s\n" "#define CACHED_LOADS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4184,13 +4263,14 @@ then : printf "%s\n" "EXTENDED_DEFAULT=$with_extendedDefault" >&6; } printf "%s\n" "#define EXTENDED_DEFAULT \"$with_extendedDefault\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXTENDED_DEFAULT=$withval" >&5 printf "%s\n" "EXTENDED_DEFAULT=$withval" >&6; } EXTENDED_DEFAULT="$withval" printf "%s\n" "#define EXTENDED_DEFAULT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4205,13 +4285,14 @@ then : printf "%s\n" "SUPPORT_KSH=$with_supportKsh" >&6; } printf "%s\n" "#define SUPPORT_KSH \"$with_supportKsh\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SUPPORT_KSH=$withval" >&5 printf "%s\n" "SUPPORT_KSH=$withval" >&6; } SUPPORT_KSH="$withval" printf "%s\n" "#define SUPPORT_KSH \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4224,13 +4305,14 @@ then : printf "%s\n" "MODULEPATH_INIT=$with_ModulePathInit" >&6; } printf "%s\n" "#define MODULEPATH_INIT \"$with_ModulePathInit\"" >>confdefs.h -else $as_nop - withval="@PKG@/init/.modulespath" +else case e in #( + e) withval="@PKG@/init/.modulespath" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_INIT=$withval" >&5 printf "%s\n" "MODULEPATH_INIT=$withval" >&6; } MODULEPATH_INIT="$withval" printf "%s\n" "#define MODULEPATH_INIT \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4245,13 +4327,14 @@ then : printf "%s\n" "SITE_CONTROLLED_PREFIX=$with_siteControlPrefix" >&6; } printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$with_siteControlPrefix\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_CONTROLLED_PREFIX=$withval" >&5 printf "%s\n" "SITE_CONTROLLED_PREFIX=$withval" >&6; } SITE_CONTROLLED_PREFIX="$withval" printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4266,13 +4349,14 @@ then : printf "%s\n" "USE_BUILT_IN_PKGS=$with_useBuiltinPkgs" >&6; } printf "%s\n" "#define USE_BUILT_IN_PKGS \"$with_useBuiltinPkgs\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_BUILT_IN_PKGS=$withval" >&5 printf "%s\n" "USE_BUILT_IN_PKGS=$withval" >&6; } USE_BUILT_IN_PKGS="$withval" printf "%s\n" "#define USE_BUILT_IN_PKGS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4287,13 +4371,14 @@ then : printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$with_useDotConfigDirOnly" >&6; } printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$with_useDotConfigDirOnly\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_DOT_CONFIG_DIR_ONLY=$withval" >&5 printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$withval" >&6; } USE_DOT_CONFIG_DIR_ONLY="$withval" printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4308,13 +4393,14 @@ then : printf "%s\n" "SILENCE_SHELL_DEBUGGING=$with_silentShellDebugging" >&6; } printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$with_silentShellDebugging\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SILENCE_SHELL_DEBUGGING=$withval" >&5 printf "%s\n" "SILENCE_SHELL_DEBUGGING=$withval" >&6; } SILENCE_SHELL_DEBUGGING="$withval" printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4329,13 +4415,14 @@ then : printf "%s\n" "FAST_TCL_INTERP=$with_fastTCLInterp" >&6; } printf "%s\n" "#define FAST_TCL_INTERP \"$with_fastTCLInterp\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FAST_TCL_INTERP=$withval" >&5 printf "%s\n" "FAST_TCL_INTERP=$withval" >&6; } FAST_TCL_INTERP="$withval" printf "%s\n" "#define FAST_TCL_INTERP \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4350,13 +4437,14 @@ then : printf "%s\n" "MODULE_AUTO_HANDLING=$with-moduleAutoHandling" >&6; } printf "%s\n" "#define MODULE_AUTO_HANDLING \"$with-moduleAutoHandling\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULE_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULE_AUTO_HANDLING=$withval" >&6; } MODULE_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULE_AUTO_HANDLING \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4371,13 +4459,14 @@ then : printf "%s\n" "AVAIL_EXTENSIONS=$with_availExtensions" >&6; } printf "%s\n" "#define AVAIL_EXTENSIONS \"$with_availExtensions\"" >>confdefs.h -else $as_nop - withval="yes" +else case e in #( + e) withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AVAIL_EXTENSIONS=$withval" >&5 printf "%s\n" "AVAIL_EXTENSIONS=$withval" >&6; } AVAIL_EXTENSIONS="$withval" printf "%s\n" "#define AVAIL_EXTENSIONS \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4395,13 +4484,14 @@ then : printf "%s\n" "PATH_TO_LUA=$with_lua" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$with_lua\"" >>confdefs.h -else $as_nop - withval="lua" +else case e in #( + e) withval="lua" PATH_TO_LUA="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$withval" >&5 printf "%s\n" "PATH_TO_LUA=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4419,13 +4509,14 @@ then : printf "%s\n" "PATH_TO_LUAC=$with_luac" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$with_luac\"" >>confdefs.h -else $as_nop - withval="luac" +else case e in #( + e) withval="luac" PATH_TO_LUAC="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$withval" >&5 printf "%s\n" "PATH_TO_LUAC=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$withval\"" >>confdefs.h - + ;; +esac fi @@ -4440,13 +4531,14 @@ then : printf "%s\n" "LUA_SUFFIX=$with_luaSuffic" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$with_luaSuffix\"" >>confdefs.h -else $as_nop - withval="no" +else case e in #( + e) withval="no" LUA_SUFFIX="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_SUFFIX=$withval" >&5 printf "%s\n" "LUA_SUFFIX=$withval" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$withval\"" >>confdefs.h - + ;; +esac fi if test "$ALLOW_TCL_MFILES" = no ; then @@ -4475,8 +4567,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else $as_nop - case $pkgConfig in +else case e in #( + e) case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -4502,6 +4594,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; +esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -4558,8 +4651,8 @@ then : printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "tcl.hh" "ac_cv_header_tcl_hh" "$ac_includes_default" -if test "x$ac_cv_header_tcl_hh" = xyes +ac_fn_c_check_header_compile "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default" +if test "x$ac_cv_header_tcl_h" = xyes then : printf "%s\n" "#define HAVE_TCL_H 1" >>confdefs.h @@ -4580,15 +4673,21 @@ printf %s "checking for library containing Tcl_CreateInterp... " >&6; } if test ${ac_cv_search_Tcl_CreateInterp+y} then : printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS +else case e in #( + e) ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char Tcl_CreateInterp (); + builtin and then its argument prototype would still apply. + The 'extern "C"' is for builds by C++ compilers; + although this is not generally supported in C code supporting it here + has little cost and some practical benefit (sr 110532). */ +#ifdef __cplusplus +extern "C" +#endif +char Tcl_CreateInterp (void); int main (void) { @@ -4619,11 +4718,13 @@ done if test ${ac_cv_search_Tcl_CreateInterp+y} then : -else $as_nop - ac_cv_search_Tcl_CreateInterp=no +else case e in #( + e) ac_cv_search_Tcl_CreateInterp=no ;; +esac fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS +LIBS=$ac_func_search_save_LIBS ;; +esac fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_Tcl_CreateInterp" >&5 printf "%s\n" "$ac_cv_search_Tcl_CreateInterp" >&6; } @@ -4632,8 +4733,9 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else $as_nop - rm -f makefile; as_fn_error $? "Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" "$LINENO" 5 +else case e in #( + e) rm -f makefile; as_fn_error $? "Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" "$LINENO" 5 ;; +esac fi @@ -4666,14 +4768,6 @@ PATH_TO_SRC=$SRCDIR -FOUND_ERROR=yes -MSG="MODE must have at least one executable bit set (Not MODE=$MODE)| -Please try setting mode to 755 or 750 or 700 or similar." - - echo "$MSG" - echo -ERR_MSG="$ERR_MSG||$MSG" - if test $MODE == "user_default" ; then mode=0755 EXEC_BITS=$(( 0111 & $mode )); @@ -4698,8 +4792,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PS+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PS in +else case e in #( + e) case $PS in [\\/]* | ?:[\\/]*) ac_cv_path_PS="$PS" # Let the user override the test with a path. ;; @@ -4725,6 +4819,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PS" && ac_cv_path_PS="UNKNOWN_PS" ;; +esac ;; esac fi PS=$ac_cv_path_PS @@ -4752,8 +4847,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_READLINK+y} then : printf %s "(cached) " >&6 -else $as_nop - case $READLINK in +else case e in #( + e) case $READLINK in [\\/]* | ?:[\\/]*) ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path. ;; @@ -4779,6 +4874,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_READLINK" && ac_cv_path_READLINK="UNKNOWN_READLINK" ;; +esac ;; esac fi READLINK=$ac_cv_path_READLINK @@ -4808,8 +4904,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_EXPR+y} then : printf %s "(cached) " >&6 -else $as_nop - case $EXPR in +else case e in #( + e) case $EXPR in [\\/]* | ?:[\\/]*) ac_cv_path_EXPR="$EXPR" # Let the user override the test with a path. ;; @@ -4834,6 +4930,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi EXPR=$ac_cv_path_EXPR @@ -4867,8 +4964,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BASENAME+y} then : printf %s "(cached) " >&6 -else $as_nop - case $BASENAME in +else case e in #( + e) case $BASENAME in [\\/]* | ?:[\\/]*) ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path. ;; @@ -4893,6 +4990,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi BASENAME=$ac_cv_path_BASENAME @@ -4926,8 +5024,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BC+y} then : printf %s "(cached) " >&6 -else $as_nop - case $BC in +else case e in #( + e) case $BC in [\\/]* | ?:[\\/]*) ac_cv_path_BC="$BC" # Let the user override the test with a path. ;; @@ -4952,6 +5050,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi BC=$ac_cv_path_BC @@ -4983,8 +5082,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_POD2MAN+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_POD2MAN in +else case e in #( + e) case $PATH_TO_POD2MAN in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_POD2MAN="$PATH_TO_POD2MAN" # Let the user override the test with a path. ;; @@ -5010,6 +5109,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_POD2MAN" && ac_cv_path_PATH_TO_POD2MAN="UNKNOWN_POD2MAN" ;; +esac ;; esac fi PATH_TO_POD2MAN=$ac_cv_path_PATH_TO_POD2MAN @@ -5030,8 +5130,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_GIT+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_GIT in +else case e in #( + e) case $PATH_TO_GIT in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_GIT="$PATH_TO_GIT" # Let the user override the test with a path. ;; @@ -5057,6 +5157,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_GIT" && ac_cv_path_PATH_TO_GIT="""" ;; +esac ;; esac fi PATH_TO_GIT=$ac_cv_path_PATH_TO_GIT @@ -5078,8 +5179,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_PAGER+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_PAGER in +else case e in #( + e) case $PATH_TO_PAGER in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_PAGER="$PATH_TO_PAGER" # Let the user override the test with a path. ;; @@ -5104,6 +5205,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PATH_TO_PAGER=$ac_cv_path_PATH_TO_PAGER @@ -5130,8 +5232,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_HASHSUM+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_HASHSUM in +else case e in #( + e) case $PATH_TO_HASHSUM in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_HASHSUM="$PATH_TO_HASHSUM" # Let the user override the test with a path. ;; @@ -5156,6 +5258,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PATH_TO_HASHSUM=$ac_cv_path_PATH_TO_HASHSUM @@ -5189,8 +5292,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TCLSH+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_TCLSH in +else case e in #( + e) case $PATH_TO_TCLSH in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TCLSH="$PATH_TO_TCLSH" # Let the user override the test with a path. ;; @@ -5216,6 +5319,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_TCLSH" && ac_cv_path_PATH_TO_TCLSH="UNKNOWN_TCLSH" ;; +esac ;; esac fi PATH_TO_TCLSH=$ac_cv_path_PATH_TO_TCLSH @@ -5244,8 +5348,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TR+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_TR in +else case e in #( + e) case $PATH_TO_TR in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TR="$PATH_TO_TR" # Let the user override the test with a path. ;; @@ -5270,6 +5374,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PATH_TO_TR=$ac_cv_path_PATH_TO_TR @@ -5295,8 +5400,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_LS+y} then : printf %s "(cached) " >&6 -else $as_nop - case $PATH_TO_LS in +else case e in #( + e) case $PATH_TO_LS in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_LS="$PATH_TO_LS" # Let the user override the test with a path. ;; @@ -5321,6 +5426,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi PATH_TO_LS=$ac_cv_path_PATH_TO_LS @@ -5386,8 +5492,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUA+y} then : printf %s "(cached) " >&6 -else $as_nop - case $FIND_PATH_TO_LUA in +else case e in #( + e) case $FIND_PATH_TO_LUA in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUA="$FIND_PATH_TO_LUA" # Let the user override the test with a path. ;; @@ -5412,6 +5518,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi FIND_PATH_TO_LUA=$ac_cv_path_FIND_PATH_TO_LUA @@ -5441,8 +5548,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUAC+y} then : printf %s "(cached) " >&6 -else $as_nop - case $FIND_PATH_TO_LUAC in +else case e in #( + e) case $FIND_PATH_TO_LUAC in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUAC="$FIND_PATH_TO_LUAC" # Let the user override the test with a path. ;; @@ -5467,6 +5574,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi FIND_PATH_TO_LUAC=$ac_cv_path_FIND_PATH_TO_LUAC @@ -5613,8 +5721,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else $as_nop - case $pkgConfig in +else case e in #( + e) case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -5640,6 +5748,7 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; +esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -5709,8 +5818,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ZSH+y} then : printf %s "(cached) " >&6 -else $as_nop - case $ZSH in +else case e in #( + e) case $ZSH in [\\/]* | ?:[\\/]*) ac_cv_path_ZSH="$ZSH" # Let the user override the test with a path. ;; @@ -5735,6 +5844,7 @@ done IFS=$as_save_IFS ;; +esac ;; esac fi ZSH=$ac_cv_path_ZSH @@ -5818,8 +5928,8 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the +# 'ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* 'ac_cv_foo' will be assigned the # following values. _ACEOF @@ -5849,14 +5959,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote + # 'set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # `set' quotes correctly as required by POSIX, so do not add quotes. + # 'set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -5920,9 +6030,7 @@ s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g t quote b any :quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g +s/[][ `~#$^&*(){}\\|;'\''"<>?]/\\&/g s/\$/$$/g H :any @@ -5982,7 +6090,6 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -5991,12 +6098,13 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop - case `(set -o) 2>/dev/null` in #( +else case e in #( + e) case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; +esac ;; esac fi @@ -6068,7 +6176,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as `sh COMMAND' +# We did not find ourselves, most probably we were run as 'sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -6097,7 +6205,6 @@ as_fn_error () } # as_fn_error - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -6137,11 +6244,12 @@ then : { eval $1+=\$2 }' -else $as_nop - as_fn_append () +else case e in #( + e) as_fn_append () { eval $1=\$$1\$2 - } + } ;; +esac fi # as_fn_append # as_fn_arith ARG... @@ -6155,11 +6263,12 @@ then : { as_val=$(( $* )) }' -else $as_nop - as_fn_arith () +else case e in #( + e) as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } + } ;; +esac fi # as_fn_arith @@ -6242,9 +6351,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. + # In both cases, we have to default to 'cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -6325,10 +6434,12 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated # Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed '$as_sed_sh'" # deprecated exec 6>&1 @@ -6344,7 +6455,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.71. Invocation command line was +generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6371,7 +6482,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions +'$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -6399,10 +6510,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.71, +configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2023 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -6459,8 +6570,8 @@ do ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: '$1' +Try '$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -6510,7 +6621,7 @@ do case $ac_config_target in "makefile") CONFIG_FILES="$CONFIG_FILES makefile:Makefile.in" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; esac done @@ -6528,7 +6639,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. +# after its creation but before its name has been assigned to '$tmp'. $debug || { tmp= ac_tmp= @@ -6552,7 +6663,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. +# This happens for instance with './config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -6718,7 +6829,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6740,19 +6851,19 @@ do -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. + # because $ac_f cannot contain ':'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is `configure' which instantiates (i.e., don't + # Let's still pretend it is 'configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` @@ -6876,7 +6987,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when `$srcdir' = `.'. +# Neutralize VPATH when '$srcdir' = '.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -6905,9 +7016,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" diff --git a/configure.ac b/configure.ac index 164a0e0bb..9f93b27b9 100644 --- a/configure.ac +++ b/configure.ac @@ -730,7 +730,7 @@ if test "$FAST_TCL_INTERP" = yes ; then CPPFLAGS="$TCL_INCLUDE" - AC_CHECK_HEADER(tcl.hh, + AC_CHECK_HEADER(tcl.h, [AC_DEFINE([HAVE_TCL_H], 1, [Define to 1 if you have tcl.h])],[]) if test "$ac_cv_header_tcl_h" != yes ; then @@ -770,14 +770,6 @@ AC_SUBST(PATH_TO_HASHSUM) AC_SUBST(PATH_TO_PAGER) AC_SUBST(PATH_TO_TCLSH) -FOUND_ERROR=yes -MSG="MODE must have at least one executable bit set (Not MODE=$MODE)| -Please try setting mode to 755 or 750 or 700 or similar." - - echo "$MSG" - echo -ERR_MSG="$ERR_MSG||$MSG" - if test $MODE == "user_default" ; then mode=0755 EXEC_BITS=$(( 0111 & $mode )); From d9967342deaf22b2ff5a1b34bfaeec492b6bd342 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 1 Aug 2024 09:43:50 -0500 Subject: [PATCH 051/198] fix tcl.hh to tcl.h in configure.ac --- configure | 985 ++++++++++++++++++++++----------------------------- configure.ac | 2 +- 2 files changed, 434 insertions(+), 553 deletions(-) diff --git a/configure b/configure index 32ad3975c..3168704f3 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72. +# Generated by GNU Autoconf 2.71. # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, # Inc. # # @@ -15,6 +15,7 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -23,13 +24,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else case e in #( - e) case `(set -o) 2>/dev/null` in #( +else $as_nop + case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi @@ -101,7 +101,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as 'sh COMMAND' +# We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -131,14 +131,15 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed 'exec'. +# out after a failed `exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh NULLCMD=: @@ -146,13 +147,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else case e in #( - e) case \`(set -o) 2>/dev/null\` in #( +else \$as_nop + case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi " @@ -170,9 +170,8 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : -else case e in #( - e) exitcode=1; echo positional parameters were not saved. ;; -esac +else \$as_nop + exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 blah=\$(echo \$(echo blah)) @@ -185,15 +184,14 @@ test -x / || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes -else case e in #( - e) as_have_required=no ;; -esac +else $as_nop + as_have_required=no fi if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null then : -else case e in #( - e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else $as_nop + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do @@ -226,13 +224,12 @@ IFS=$as_save_IFS if $as_found then : -else case e in #( - e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null then : CONFIG_SHELL=$SHELL as_have_required=yes -fi ;; -esac +fi fi @@ -254,7 +251,7 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed 'exec'. +# out after a failed `exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -273,8 +270,7 @@ $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." fi exit 1 -fi ;; -esac +fi fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -313,6 +309,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -381,12 +385,11 @@ then : { eval $1+=\$2 }' -else case e in #( - e) as_fn_append () +else $as_nop + as_fn_append () { eval $1=\$$1\$2 - } ;; -esac + } fi # as_fn_append # as_fn_arith ARG... @@ -400,14 +403,21 @@ then : { as_val=$(( $* )) }' -else case e in #( - e) as_fn_arith () +else $as_nop + as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } ;; -esac + } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -481,8 +491,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' - t clear - :clear s/[$]LINENO.*/&-/ t lineno b @@ -531,6 +539,7 @@ esac as_echo='printf %s\n' as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -542,9 +551,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. - # In both cases, we have to default to 'cp -pR'. + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -569,12 +578,10 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -as_tr_sh="eval sed '$as_sed_sh'" # deprecated +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" test -n "$DJDIR" || exec 7<&0 /dev/null && - as_fn_error $? "invalid feature name: '$ac_useropt'" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -957,7 +964,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: '$ac_useropt'" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1170,7 +1177,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: '$ac_useropt'" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1186,7 +1193,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: '$ac_useropt'" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1216,8 +1223,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: '$ac_option' -Try '$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1225,7 +1232,7 @@ Try '$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: '$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1275,7 +1282,7 @@ do as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: '$host' +# There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -1343,7 +1350,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -1371,7 +1378,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures this package to adapt to many kinds of systems. +\`configure' configures this package to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1385,11 +1392,11 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print 'checking ...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for '--cache-file=config.cache' + -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or '..'] + --srcdir=DIR find the sources in DIR [configure dir or \`..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1397,10 +1404,10 @@ Installation directories: --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, 'make install' will install all the files in -'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify -an installation prefix other than '$ac_default_prefix' using '--prefix', -for instance '--prefix=\$HOME'. +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. For better control, use the options below. @@ -1539,7 +1546,7 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory -Use these variables to override the choices made by 'configure' or to help +Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to the package provider. @@ -1607,9 +1614,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.72 +generated by GNU Autoconf 2.71 -Copyright (C) 2023 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1648,12 +1655,11 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + ac_retval=1 fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1672,8 +1678,8 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> @@ -1681,12 +1687,10 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac +else $as_nop + eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -1726,12 +1730,11 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + ac_retval=1 fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -1767,7 +1770,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.72. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2013,10 +2016,10 @@ esac printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See 'config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2052,7 +2055,9 @@ struct stat; /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (char **p, int i) +static char *e (p, i) + char **p; + int i; { return p[i]; } @@ -2066,21 +2071,6 @@ static char *f (char * (*g) (char **, int), char **p, ...) return s; } -/* C89 style stringification. */ -#define noexpand_stringify(a) #a -const char *stringified = noexpand_stringify(arbitrary+token=sequence); - -/* C89 style token pasting. Exercises some of the corner cases that - e.g. old MSVC gets wrong, but not very hard. */ -#define noexpand_concat(a,b) a##b -#define expand_concat(a,b) noexpand_concat(a,b) -extern int vA; -extern int vbee; -#define aye A -#define bee B -int *pvA = &expand_concat(v,aye); -int *pvbee = &noexpand_concat(v,bee); - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not \xHH hex character constants. These do not provoke an error unfortunately, instead are silently treated @@ -2108,19 +2098,16 @@ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); # Test code for whether the C compiler supports C99 (global declarations) ac_c_conftest_c99_globals=' -/* Does the compiler advertise C99 conformance? */ +// Does the compiler advertise C99 conformance? #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L # error "Compiler does not advertise C99 conformance" #endif -// See if C++-style comments work. - #include extern int puts (const char *); extern int printf (const char *, ...); extern int dprintf (int, const char *, ...); extern void *malloc (size_t); -extern void free (void *); // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare @@ -2170,6 +2157,7 @@ typedef const char *ccp; static inline int test_restrict (ccp restrict text) { + // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) @@ -2235,8 +2223,6 @@ ac_c_conftest_c99_main=' ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; - // Work around memory leak warnings. - free (ia); // Check named initializers. struct named_init ni = { @@ -2258,7 +2244,7 @@ ac_c_conftest_c99_main=' # Test code for whether the C compiler supports C11 (global declarations) ac_c_conftest_c11_globals=' -/* Does the compiler advertise C11 conformance? */ +// Does the compiler advertise C11 conformance? #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L # error "Compiler does not advertise C11 conformance" #endif @@ -2381,12 +2367,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2395,18 +2381,18 @@ printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -2422,11 +2408,11 @@ printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## @@ -2464,8 +2450,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2487,8 +2473,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2510,8 +2495,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2533,8 +2518,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2569,8 +2553,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2592,8 +2576,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2615,8 +2598,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -2655,8 +2638,7 @@ if test $ac_prog_rejected = yes; then ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2680,8 +2662,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2703,8 +2685,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2730,8 +2711,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2753,8 +2734,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2792,8 +2772,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2815,8 +2795,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2838,8 +2817,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2861,8 +2840,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2891,10 +2869,10 @@ fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See 'config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2966,8 +2944,8 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. -# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -2987,7 +2965,7 @@ do ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an '-o' + # safe: cross compilers may not add the suffix if given an `-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -2998,9 +2976,8 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else case e in #( - e) ac_file='' ;; -esac +else $as_nop + ac_file='' fi if test -z "$ac_file" then : @@ -3009,14 +2986,13 @@ printf "%s\n" "no" >&6; } printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See 'config.log' for more details" "$LINENO" 5; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 printf %s "checking for C compiler default output file name... " >&6; } @@ -3040,10 +3016,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) -# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will -# work properly (i.e., refer to 'conftest.exe'), while it won't with -# 'rm'. + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -3053,12 +3029,11 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else case e in #( - e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See 'config.log' for more details" "$LINENO" 5; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3074,8 +3049,6 @@ int main (void) { FILE *f = fopen ("conftest.out", "w"); - if (!f) - return 1; return ferror (f) || fclose (f) != 0; ; @@ -3115,27 +3088,26 @@ printf "%s\n" "$ac_try_echo"; } >&5 if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use '--host'. -See 'config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext \ - conftest.o conftest.obj conftest.out +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } if test ${ac_cv_objext+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3167,18 +3139,16 @@ then : break;; esac done -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See 'config.log' for more details" "$LINENO" 5; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; -esac +rm -f conftest.$ac_cv_objext conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 printf "%s\n" "$ac_cv_objext" >&6; } @@ -3189,8 +3159,8 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } if test ${ac_cv_c_compiler_gnu+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3207,14 +3177,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes -else case e in #( - e) ac_compiler_gnu=no ;; -esac +else $as_nop + ac_compiler_gnu=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } @@ -3232,8 +3200,8 @@ printf %s "checking whether $CC accepts -g... " >&6; } if test ${ac_cv_prog_cc_g+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_save_c_werror_flag=$ac_c_werror_flag +else $as_nop + ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -3251,8 +3219,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes -else case e in #( - e) CFLAGS="" +else $as_nop + CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3267,8 +3235,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else case e in #( - e) ac_c_werror_flag=$ac_save_c_werror_flag +else $as_nop + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3285,15 +3253,12 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag ;; -esac + ac_c_werror_flag=$ac_save_c_werror_flag fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 printf "%s\n" "$ac_cv_prog_cc_g" >&6; } @@ -3320,8 +3285,8 @@ printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c11=no +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3338,28 +3303,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c11" = x +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" ;; -esac + CC="$CC $ac_cv_prog_cc_c11" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 ;; -esac + ac_prog_cc_stdc=c11 fi fi if test x$ac_prog_cc_stdc = xno @@ -3369,8 +3331,8 @@ printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c99=no +else $as_nop + ac_cv_prog_cc_c99=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3387,28 +3349,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c99" = x +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" ;; -esac + CC="$CC $ac_cv_prog_cc_c99" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 ;; -esac + ac_prog_cc_stdc=c99 fi fi if test x$ac_prog_cc_stdc = xno @@ -3418,8 +3377,8 @@ printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c89=no +else $as_nop + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3436,28 +3395,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c89" = x +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" ;; -esac + CC="$CC $ac_cv_prog_cc_c89" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 ;; -esac + ac_prog_cc_stdc=c89 fi fi @@ -3519,14 +3475,13 @@ then : printf "%s\n" "DUPLICATE_PATHS=$with_duplicatePaths" >&6; } printf "%s\n" "#define DUPLICATE_PATHS \"$with_duplicatePaths\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DUPLICATE_PATHS=$withval" >&5 printf "%s\n" "DUPLICATE_PATHS=$withval" >&6; } DUPLICATE_PATHS="$withval" printf "%s\n" "#define DUPLICATE_PATHS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3541,14 +3496,13 @@ then : printf "%s\n" "LMOD_ALLOW_ROOT_USE=$with_allowRootUse" >&6; } printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$with_allowRootUse\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_ALLOW_ROOT_USE=$withval" >&5 printf "%s\n" "LMOD_ALLOW_ROOT_USE=$withval" >&6; } LMOD_ALLOW_ROOT_USE="$withval" printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3561,14 +3515,13 @@ then : printf "%s\n" "SITE_MSG_FILE=$with_siteMsgFile" >&6; } printf "%s\n" "#define SITE_MSG_FILE \"$with_siteMsgFile\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_MSG_FILE=$withval" >&5 printf "%s\n" "SITE_MSG_FILE=$withval" >&6; } SITE_MSG_FILE="$withval" printf "%s\n" "#define SITE_MSG_FILE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3581,14 +3534,13 @@ then : printf "%s\n" "LMOD_OVERRIDE_LANG=$with_lang" >&6; } printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$with_lang\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_OVERRIDE_LANG=$withval" >&5 printf "%s\n" "LMOD_OVERRIDE_LANG=$withval" >&6; } LMOD_OVERRIDE_LANG="$withval" printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3603,14 +3555,13 @@ then : printf "%s\n" "CASE_INDEPENDENT_SORTING=$with_caseIndependentSorting" >&6; } printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$with_caseIndependentSorting\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CASE_INDEPENDENT_SORTING=$withval" >&5 printf "%s\n" "CASE_INDEPENDENT_SORTING=$withval" >&6; } CASE_INDEPENDENT_SORTING="$withval" printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3625,14 +3576,13 @@ then : printf "%s\n" "COLORIZE=$with_colorize" >&6; } printf "%s\n" "#define COLORIZE \"$with_colorize\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: COLORIZE=$withval" >&5 printf "%s\n" "COLORIZE=$withval" >&6; } COLORIZE="$withval" printf "%s\n" "#define COLORIZE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3647,14 +3597,13 @@ then : printf "%s\n" "DYNAMIC_SPIDER_CACHE=$with_dynamicSpiderCache" >&6; } printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$with_dynamicSpiderCache\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DYNAMIC_SPIDER_CACHE=$withval" >&5 printf "%s\n" "DYNAMIC_SPIDER_CACHE=$withval" >&6; } DYNAMIC_SPIDER_CACHE="$withval" printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3669,14 +3618,13 @@ then : printf "%s\n" "HIDDEN_ITALIC=$with_hiddenItalic" >&6; } printf "%s\n" "#define HIDDEN_ITALIC \"$with_hiddenItalic\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HIDDEN_ITALIC=$withval" >&5 printf "%s\n" "HIDDEN_ITALIC=$withval" >&6; } HIDDEN_ITALIC="$withval" printf "%s\n" "#define HIDDEN_ITALIC \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3691,14 +3639,13 @@ then : printf "%s\n" "EXACT_MATCH=$with_exactMatch" >&6; } printf "%s\n" "#define EXACT_MATCH \"$with_exactMatch\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXACT_MATCH=$withval" >&5 printf "%s\n" "EXACT_MATCH=$withval" >&6; } EXACT_MATCH="$withval" printf "%s\n" "#define EXACT_MATCH \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3712,14 +3659,13 @@ then : printf "%s\n" "MODE=$with_mode" >&6; } printf "%s\n" "#define MODE \"$with_mode\"" >>confdefs.h -else case e in #( - e) withval="user_default" +else $as_nop + withval="user_default" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODE=$withval" >&5 printf "%s\n" "MODE=$withval" >&6; } MODE="$withval" printf "%s\n" "#define MODE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3732,14 +3678,13 @@ then : printf "%s\n" "LMOD_CONFIG_DIR=$with_lmodConfigDir" >&6; } printf "%s\n" "#define LMOD_CONFIG_DIR \"$with_lmodConfigDir\"" >>confdefs.h -else case e in #( - e) withval="/etc/lmod" +else $as_nop + withval="/etc/lmod" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_CONFIG_DIR=$withval" >&5 printf "%s\n" "LMOD_CONFIG_DIR=$withval" >&6; } LMOD_CONFIG_DIR="$withval" printf "%s\n" "#define LMOD_CONFIG_DIR \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3754,14 +3699,13 @@ then : printf "%s\n" "AUTO_SWAP=$with_autoSwap" >&6; } printf "%s\n" "#define AUTO_SWAP \"$with_autoSwap\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AUTO_SWAP=$withval" >&5 printf "%s\n" "AUTO_SWAP=$withval" >&6; } AUTO_SWAP="$withval" printf "%s\n" "#define AUTO_SWAP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3778,14 +3722,13 @@ then : printf "%s\n" "EXPORT_MODULE=$with_exportedModuleCmd" >&6; } printf "%s\n" "#define EXPORT_MODULE \"$with_exportedModuleCmd\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXPORT_MODULE=$withval" >&5 printf "%s\n" "EXPORT_MODULE=$withval" >&6; } EXPORT_MODULE="$withval" printf "%s\n" "#define EXPORT_MODULE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3800,14 +3743,13 @@ then : printf "%s\n" "REDIRECT=$with_redirect" >&6; } printf "%s\n" "#define REDIRECT \"$with_redirect\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: REDIRECT=$withval" >&5 printf "%s\n" "REDIRECT=$withval" >&6; } REDIRECT="$withval" printf "%s\n" "#define REDIRECT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3819,14 +3761,13 @@ then : printf "%s\n" "MODULEPATH_ROOT=$with_module_root_path" >&6; } printf "%s\n" "#define MODULEPATH_ROOT \"$with_module_root_path\"" >>confdefs.h -else case e in #( - e) withval="$prefix/modulefiles" +else $as_nop + withval="$prefix/modulefiles" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_ROOT=$withval" >&5 printf "%s\n" "MODULEPATH_ROOT=$withval" >&6; } MODULEPATH_ROOT="$withval" printf "%s\n" "#define MODULEPATH_ROOT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3839,14 +3780,13 @@ then : printf "%s\n" "ANCIENT=$with_ancient" >&6; } printf "%s\n" "#define ANCIENT \"$with_ancient\"" >>confdefs.h -else case e in #( - e) withval="86400" +else $as_nop + withval="86400" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ANCIENT=$withval" >&5 printf "%s\n" "ANCIENT=$withval" >&6; } ANCIENT="$withval" printf "%s\n" "#define ANCIENT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3859,14 +3799,13 @@ then : printf "%s\n" "SHORT_TIME=$with_shortTime" >&6; } printf "%s\n" "#define SHORT_TIME \"$with_shortTime\"" >>confdefs.h -else case e in #( - e) withval="2" +else $as_nop + withval="2" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SHORT_TIME=$withval" >&5 printf "%s\n" "SHORT_TIME=$withval" >&6; } SHORT_TIME="$withval" printf "%s\n" "#define SHORT_TIME \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3879,14 +3818,13 @@ then : printf "%s\n" "SPIDER_CACHE_DIRS=$with_spiderCacheDir" >&6; } printf "%s\n" "#define SPIDER_CACHE_DIRS \"$with_spiderCacheDir\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DIRS=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DIRS=$withval" >&6; } SPIDER_CACHE_DIRS="$withval" printf "%s\n" "#define SPIDER_CACHE_DIRS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3899,14 +3837,13 @@ then : printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$with_spiderCacheDescript" >&6; } printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$with_spiderCacheDescript\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DESCRIPT_FN=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$withval" >&6; } SPIDER_CACHE_DESCRIPT_FN="$withval" printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3919,14 +3856,13 @@ then : printf "%s\n" "UPDATE_SYSTEM_FN=$with_updateSystemFn" >&6; } printf "%s\n" "#define UPDATE_SYSTEM_FN \"$with_updateSystemFn\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: UPDATE_SYSTEM_FN=$withval" >&5 printf "%s\n" "UPDATE_SYSTEM_FN=$withval" >&6; } UPDATE_SYSTEM_FN="$withval" printf "%s\n" "#define UPDATE_SYSTEM_FN \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3939,14 +3875,13 @@ then : printf "%s\n" "PREPEND_BLOCK=$with_prependBlock" >&6; } printf "%s\n" "#define PREPEND_BLOCK \"$with_prependBlock\"" >>confdefs.h -else case e in #( - e) withval="normal" +else $as_nop + withval="normal" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PREPEND_BLOCK=$withval" >&5 printf "%s\n" "PREPEND_BLOCK=$withval" >&6; } PREPEND_BLOCK="$withval" printf "%s\n" "#define PREPEND_BLOCK \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3959,14 +3894,13 @@ then : printf "%s\n" "SITE_NAME=$with_siteName" >&6; } printf "%s\n" "#define SITE_NAME \"$with_siteName\"" >>confdefs.h -else case e in #( - e) withval='' +else $as_nop + withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_NAME=$withval" >&5 printf "%s\n" "SITE_NAME=$withval" >&6; } SITE_NAME="$withval" printf "%s\n" "#define SITE_NAME \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3979,14 +3913,13 @@ then : printf "%s\n" "SYSHOST=$with_syshost" >&6; } printf "%s\n" "#define SYSHOST \"$with_syshost\"" >>confdefs.h -else case e in #( - e) withval='' +else $as_nop + withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SYSHOST=$withval" >&5 printf "%s\n" "SYSHOST=$withval" >&6; } SYSHOST="$withval" printf "%s\n" "#define SYSHOST \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4001,14 +3934,13 @@ then : printf "%s\n" "ALLOW_TCL_MFILES==$withval" >&6; } printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ALLOW_TCL_MFILES=$withval" >&5 printf "%s\n" "ALLOW_TCL_MFILES=$withval" >&6; } ALLOW_TCL_MFILES="$withval" printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4023,14 +3955,13 @@ then : printf "%s\n" "DISABLE_NAME_AUTOSWAP==$withval" >&6; } printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DISABLE_NAME_AUTOSWAP=$withval" >&5 printf "%s\n" "DISABLE_NAME_AUTOSWAP=$withval" >&6; } DISABLE_NAME_AUTOSWAP="$withval" printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4045,14 +3976,13 @@ then : printf "%s\n" "MPATH_AVAIL==$withval" >&6; } printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MPATH_AVAIL=$withval" >&5 printf "%s\n" "MPATH_AVAIL=$withval" >&6; } MPATH_AVAIL="$withval" printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4067,14 +3997,13 @@ then : printf "%s\n" "SETTARG=$with_settarg" >&6; } printf "%s\n" "#define SETTARG \"$with_settarg\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SETTARG=$withval" >&5 printf "%s\n" "SETTARG=$withval" >&6; } SETTARG="$withval" printf "%s\n" "#define SETTARG \"$withval\"" >>confdefs.h - ;; -esac + fi DFLT_IGNORE_DIRS=".svn,.git,.hg,.bzr" @@ -4089,14 +4018,13 @@ then : printf "%s\n" "IGNORE_DIRS=$with_ignoreDirs" >&6; } printf "%s\n" "#define IGNORE_DIRS \"$with_ignoreDirs\"" >>confdefs.h -else case e in #( - e) withval="$DFLT_IGNORE_DIRS" +else $as_nop + withval="$DFLT_IGNORE_DIRS" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IGNORE_DIRS=$withval" >&5 printf "%s\n" "IGNORE_DIRS=$withval" >&6; } IGNORE_DIRS="$withval" printf "%s\n" "#define IGNORE_DIRS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4111,14 +4039,13 @@ then : printf "%s\n" "PIN_VERSIONS=$with_pinVersions" >&6; } printf "%s\n" "#define PIN_VERSIONS \"$with_pinVersions\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PIN_VERSIONS=$withval" >&5 printf "%s\n" "PIN_VERSIONS=$withval" >&6; } PIN_VERSIONS="$withval" printf "%s\n" "#define PIN_VERSIONS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4133,14 +4060,13 @@ then : printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$with_downstreamConflicts" >&6; } printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$with_downstreamConflicts\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_DOWNSTREAM_CONFLICTS=$withval" >&5 printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$withval" >&6; } LMOD_DOWNSTREAM_CONFLICTS="$withval" printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4155,14 +4081,13 @@ then : printf "%s\n" "MODULES_AUTO_HANDLING=$with_modulesAutoHandling" >&6; } printf "%s\n" "#define MODULES_AUTO_HANDLING \"$with_modulesAutoHandling\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULES_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULES_AUTO_HANDLING=$withval" >&6; } MODULES_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULES_AUTO_HANDLING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4177,14 +4102,13 @@ then : printf "%s\n" "TMOD_PATH_RULE=$with_tmodPathRule" >&6; } printf "%s\n" "#define TMOD_PATH_RULE \"$with_tmodPathRule\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_PATH_RULE=$withval" >&5 printf "%s\n" "TMOD_PATH_RULE=$withval" >&6; } TMOD_PATH_RULE="$withval" printf "%s\n" "#define TMOD_PATH_RULE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4199,14 +4123,13 @@ then : printf "%s\n" "TMOD_FIND_FIRST=$with_tmodFindFirst" >&6; } printf "%s\n" "#define TMOD_FIND_FIRST \"$with_tmodFindFirst\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_FIND_FIRST=$withval" >&5 printf "%s\n" "TMOD_FIND_FIRST=$withval" >&6; } TMOD_FIND_FIRST="$withval" printf "%s\n" "#define TMOD_FIND_FIRST \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4219,14 +4142,13 @@ then : printf "%s\n" "LUA_INCLUDE=$with_lua_include" >&6; } printf "%s\n" "#define LUA_INCLUDE \"$with_lua_include\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_INCLUDE=$withval" >&5 printf "%s\n" "LUA_INCLUDE=$withval" >&6; } LUA_INCLUDE="$withval" printf "%s\n" "#define LUA_INCLUDE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4241,14 +4163,13 @@ then : printf "%s\n" "CACHED_LOADS=$with_cachedLoads" >&6; } printf "%s\n" "#define CACHED_LOADS \"$with_cachedLoads\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CACHED_LOADS=$withval" >&5 printf "%s\n" "CACHED_LOADS=$withval" >&6; } CACHED_LOADS="$withval" printf "%s\n" "#define CACHED_LOADS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4263,14 +4184,13 @@ then : printf "%s\n" "EXTENDED_DEFAULT=$with_extendedDefault" >&6; } printf "%s\n" "#define EXTENDED_DEFAULT \"$with_extendedDefault\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXTENDED_DEFAULT=$withval" >&5 printf "%s\n" "EXTENDED_DEFAULT=$withval" >&6; } EXTENDED_DEFAULT="$withval" printf "%s\n" "#define EXTENDED_DEFAULT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4285,14 +4205,13 @@ then : printf "%s\n" "SUPPORT_KSH=$with_supportKsh" >&6; } printf "%s\n" "#define SUPPORT_KSH \"$with_supportKsh\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SUPPORT_KSH=$withval" >&5 printf "%s\n" "SUPPORT_KSH=$withval" >&6; } SUPPORT_KSH="$withval" printf "%s\n" "#define SUPPORT_KSH \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4305,14 +4224,13 @@ then : printf "%s\n" "MODULEPATH_INIT=$with_ModulePathInit" >&6; } printf "%s\n" "#define MODULEPATH_INIT \"$with_ModulePathInit\"" >>confdefs.h -else case e in #( - e) withval="@PKG@/init/.modulespath" +else $as_nop + withval="@PKG@/init/.modulespath" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_INIT=$withval" >&5 printf "%s\n" "MODULEPATH_INIT=$withval" >&6; } MODULEPATH_INIT="$withval" printf "%s\n" "#define MODULEPATH_INIT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4327,14 +4245,13 @@ then : printf "%s\n" "SITE_CONTROLLED_PREFIX=$with_siteControlPrefix" >&6; } printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$with_siteControlPrefix\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_CONTROLLED_PREFIX=$withval" >&5 printf "%s\n" "SITE_CONTROLLED_PREFIX=$withval" >&6; } SITE_CONTROLLED_PREFIX="$withval" printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4349,14 +4266,13 @@ then : printf "%s\n" "USE_BUILT_IN_PKGS=$with_useBuiltinPkgs" >&6; } printf "%s\n" "#define USE_BUILT_IN_PKGS \"$with_useBuiltinPkgs\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_BUILT_IN_PKGS=$withval" >&5 printf "%s\n" "USE_BUILT_IN_PKGS=$withval" >&6; } USE_BUILT_IN_PKGS="$withval" printf "%s\n" "#define USE_BUILT_IN_PKGS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4371,14 +4287,13 @@ then : printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$with_useDotConfigDirOnly" >&6; } printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$with_useDotConfigDirOnly\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_DOT_CONFIG_DIR_ONLY=$withval" >&5 printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$withval" >&6; } USE_DOT_CONFIG_DIR_ONLY="$withval" printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4393,14 +4308,13 @@ then : printf "%s\n" "SILENCE_SHELL_DEBUGGING=$with_silentShellDebugging" >&6; } printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$with_silentShellDebugging\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SILENCE_SHELL_DEBUGGING=$withval" >&5 printf "%s\n" "SILENCE_SHELL_DEBUGGING=$withval" >&6; } SILENCE_SHELL_DEBUGGING="$withval" printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4415,14 +4329,13 @@ then : printf "%s\n" "FAST_TCL_INTERP=$with_fastTCLInterp" >&6; } printf "%s\n" "#define FAST_TCL_INTERP \"$with_fastTCLInterp\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FAST_TCL_INTERP=$withval" >&5 printf "%s\n" "FAST_TCL_INTERP=$withval" >&6; } FAST_TCL_INTERP="$withval" printf "%s\n" "#define FAST_TCL_INTERP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4437,14 +4350,13 @@ then : printf "%s\n" "MODULE_AUTO_HANDLING=$with-moduleAutoHandling" >&6; } printf "%s\n" "#define MODULE_AUTO_HANDLING \"$with-moduleAutoHandling\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULE_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULE_AUTO_HANDLING=$withval" >&6; } MODULE_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULE_AUTO_HANDLING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4459,14 +4371,13 @@ then : printf "%s\n" "AVAIL_EXTENSIONS=$with_availExtensions" >&6; } printf "%s\n" "#define AVAIL_EXTENSIONS \"$with_availExtensions\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AVAIL_EXTENSIONS=$withval" >&5 printf "%s\n" "AVAIL_EXTENSIONS=$withval" >&6; } AVAIL_EXTENSIONS="$withval" printf "%s\n" "#define AVAIL_EXTENSIONS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4484,14 +4395,13 @@ then : printf "%s\n" "PATH_TO_LUA=$with_lua" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$with_lua\"" >>confdefs.h -else case e in #( - e) withval="lua" +else $as_nop + withval="lua" PATH_TO_LUA="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$withval" >&5 printf "%s\n" "PATH_TO_LUA=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4509,14 +4419,13 @@ then : printf "%s\n" "PATH_TO_LUAC=$with_luac" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$with_luac\"" >>confdefs.h -else case e in #( - e) withval="luac" +else $as_nop + withval="luac" PATH_TO_LUAC="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$withval" >&5 printf "%s\n" "PATH_TO_LUAC=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4531,14 +4440,13 @@ then : printf "%s\n" "LUA_SUFFIX=$with_luaSuffic" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$with_luaSuffix\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" LUA_SUFFIX="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_SUFFIX=$withval" >&5 printf "%s\n" "LUA_SUFFIX=$withval" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$withval\"" >>confdefs.h - ;; -esac + fi if test "$ALLOW_TCL_MFILES" = no ; then @@ -4552,7 +4460,7 @@ if test "$FAST_TCL_INTERP" = yes ; then TCL_INCLUDE="-I${DIR}/usr/include" else for i in "" tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do - if test -f /usr/include/$i/tcl.hh ; then + if test -f /usr/include/$i/tcl.h ; then TCL_INCLUDE="-I/usr/include/$i" break; fi @@ -4567,8 +4475,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $pkgConfig in +else $as_nop + case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -4594,7 +4502,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; -esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -4673,21 +4580,15 @@ printf %s "checking for library containing Tcl_CreateInterp... " >&6; } if test ${ac_cv_search_Tcl_CreateInterp+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char Tcl_CreateInterp (void); + builtin and then its argument prototype would still apply. */ +char Tcl_CreateInterp (); int main (void) { @@ -4718,13 +4619,11 @@ done if test ${ac_cv_search_Tcl_CreateInterp+y} then : -else case e in #( - e) ac_cv_search_Tcl_CreateInterp=no ;; -esac +else $as_nop + ac_cv_search_Tcl_CreateInterp=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_Tcl_CreateInterp" >&5 printf "%s\n" "$ac_cv_search_Tcl_CreateInterp" >&6; } @@ -4733,9 +4632,8 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else case e in #( - e) rm -f makefile; as_fn_error $? "Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" "$LINENO" 5 ;; -esac +else $as_nop + rm -f makefile; as_fn_error $? "Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" "$LINENO" 5 fi @@ -4792,8 +4690,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PS+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PS in +else $as_nop + case $PS in [\\/]* | ?:[\\/]*) ac_cv_path_PS="$PS" # Let the user override the test with a path. ;; @@ -4819,7 +4717,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PS" && ac_cv_path_PS="UNKNOWN_PS" ;; -esac ;; esac fi PS=$ac_cv_path_PS @@ -4847,8 +4744,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_READLINK+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $READLINK in +else $as_nop + case $READLINK in [\\/]* | ?:[\\/]*) ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path. ;; @@ -4874,7 +4771,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_READLINK" && ac_cv_path_READLINK="UNKNOWN_READLINK" ;; -esac ;; esac fi READLINK=$ac_cv_path_READLINK @@ -4904,8 +4800,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_EXPR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $EXPR in +else $as_nop + case $EXPR in [\\/]* | ?:[\\/]*) ac_cv_path_EXPR="$EXPR" # Let the user override the test with a path. ;; @@ -4930,7 +4826,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi EXPR=$ac_cv_path_EXPR @@ -4964,8 +4859,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BASENAME+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $BASENAME in +else $as_nop + case $BASENAME in [\\/]* | ?:[\\/]*) ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path. ;; @@ -4990,7 +4885,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi BASENAME=$ac_cv_path_BASENAME @@ -5024,8 +4918,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $BC in +else $as_nop + case $BC in [\\/]* | ?:[\\/]*) ac_cv_path_BC="$BC" # Let the user override the test with a path. ;; @@ -5050,7 +4944,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi BC=$ac_cv_path_BC @@ -5082,8 +4975,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_POD2MAN+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_POD2MAN in +else $as_nop + case $PATH_TO_POD2MAN in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_POD2MAN="$PATH_TO_POD2MAN" # Let the user override the test with a path. ;; @@ -5109,7 +5002,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_POD2MAN" && ac_cv_path_PATH_TO_POD2MAN="UNKNOWN_POD2MAN" ;; -esac ;; esac fi PATH_TO_POD2MAN=$ac_cv_path_PATH_TO_POD2MAN @@ -5130,8 +5022,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_GIT+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_GIT in +else $as_nop + case $PATH_TO_GIT in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_GIT="$PATH_TO_GIT" # Let the user override the test with a path. ;; @@ -5157,7 +5049,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_GIT" && ac_cv_path_PATH_TO_GIT="""" ;; -esac ;; esac fi PATH_TO_GIT=$ac_cv_path_PATH_TO_GIT @@ -5179,8 +5070,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_PAGER+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_PAGER in +else $as_nop + case $PATH_TO_PAGER in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_PAGER="$PATH_TO_PAGER" # Let the user override the test with a path. ;; @@ -5205,7 +5096,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_PAGER=$ac_cv_path_PATH_TO_PAGER @@ -5232,8 +5122,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_HASHSUM+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_HASHSUM in +else $as_nop + case $PATH_TO_HASHSUM in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_HASHSUM="$PATH_TO_HASHSUM" # Let the user override the test with a path. ;; @@ -5258,7 +5148,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_HASHSUM=$ac_cv_path_PATH_TO_HASHSUM @@ -5292,8 +5181,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TCLSH+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_TCLSH in +else $as_nop + case $PATH_TO_TCLSH in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TCLSH="$PATH_TO_TCLSH" # Let the user override the test with a path. ;; @@ -5319,7 +5208,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_TCLSH" && ac_cv_path_PATH_TO_TCLSH="UNKNOWN_TCLSH" ;; -esac ;; esac fi PATH_TO_TCLSH=$ac_cv_path_PATH_TO_TCLSH @@ -5348,8 +5236,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_TR in +else $as_nop + case $PATH_TO_TR in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TR="$PATH_TO_TR" # Let the user override the test with a path. ;; @@ -5374,7 +5262,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_TR=$ac_cv_path_PATH_TO_TR @@ -5400,8 +5287,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_LS+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_LS in +else $as_nop + case $PATH_TO_LS in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_LS="$PATH_TO_LS" # Let the user override the test with a path. ;; @@ -5426,7 +5313,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_LS=$ac_cv_path_PATH_TO_LS @@ -5492,8 +5378,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUA+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $FIND_PATH_TO_LUA in +else $as_nop + case $FIND_PATH_TO_LUA in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUA="$FIND_PATH_TO_LUA" # Let the user override the test with a path. ;; @@ -5518,7 +5404,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi FIND_PATH_TO_LUA=$ac_cv_path_FIND_PATH_TO_LUA @@ -5548,8 +5433,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUAC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $FIND_PATH_TO_LUAC in +else $as_nop + case $FIND_PATH_TO_LUAC in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUAC="$FIND_PATH_TO_LUAC" # Let the user override the test with a path. ;; @@ -5574,7 +5459,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi FIND_PATH_TO_LUAC=$ac_cv_path_FIND_PATH_TO_LUAC @@ -5721,8 +5605,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $pkgConfig in +else $as_nop + case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -5748,7 +5632,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; -esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -5818,8 +5701,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ZSH+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $ZSH in +else $as_nop + case $ZSH in [\\/]* | ?:[\\/]*) ac_cv_path_ZSH="$ZSH" # Let the user override the test with a path. ;; @@ -5844,7 +5727,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi ZSH=$ac_cv_path_ZSH @@ -5928,8 +5810,8 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# 'ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* 'ac_cv_foo' will be assigned the +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. _ACEOF @@ -5959,14 +5841,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # 'set' does not quote correctly, so add quotes: double-quote + # `set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # 'set' quotes correctly as required by POSIX, so do not add quotes. + # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -6030,7 +5912,9 @@ s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g t quote b any :quote -s/[][ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g s/\$/$$/g H :any @@ -6090,6 +5974,7 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -6098,13 +5983,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else case e in #( - e) case `(set -o) 2>/dev/null` in #( +else $as_nop + case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi @@ -6176,7 +6060,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as 'sh COMMAND' +# We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -6205,6 +6089,7 @@ as_fn_error () } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -6244,12 +6129,11 @@ then : { eval $1+=\$2 }' -else case e in #( - e) as_fn_append () +else $as_nop + as_fn_append () { eval $1=\$$1\$2 - } ;; -esac + } fi # as_fn_append # as_fn_arith ARG... @@ -6263,12 +6147,11 @@ then : { as_val=$(( $* )) }' -else case e in #( - e) as_fn_arith () +else $as_nop + as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } ;; -esac + } fi # as_fn_arith @@ -6351,9 +6234,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. - # In both cases, we have to default to 'cp -pR'. + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -6434,12 +6317,10 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -as_tr_sh="eval sed '$as_sed_sh'" # deprecated +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" exec 6>&1 @@ -6455,7 +6336,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.72. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6482,7 +6363,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -'$as_me' instantiates files and other configuration actions +\`$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -6510,10 +6391,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.72, +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2023 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -6570,8 +6451,8 @@ do ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: '$1' -Try '$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -6621,7 +6502,7 @@ do case $ac_config_target in "makefile") CONFIG_FILES="$CONFIG_FILES makefile:Makefile.in" ;; - *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -6639,7 +6520,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to '$tmp'. +# after its creation but before its name has been assigned to `$tmp'. $debug || { tmp= ac_tmp= @@ -6663,7 +6544,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with './config.status config.h'. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -6829,7 +6710,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6851,19 +6732,19 @@ do -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain ':'. + # because $ac_f cannot contain `:'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is 'configure' which instantiates (i.e., don't + # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` @@ -6987,7 +6868,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when '$srcdir' = '.'. +# Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -7016,9 +6897,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" diff --git a/configure.ac b/configure.ac index 9f93b27b9..94dc31766 100644 --- a/configure.ac +++ b/configure.ac @@ -707,7 +707,7 @@ if test "$FAST_TCL_INTERP" = yes ; then TCL_INCLUDE="-I${DIR}/usr/include" else for i in "" tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do - if test -f /usr/include/$i/tcl.hh ; then + if test -f /usr/include/$i/tcl.h ; then TCL_INCLUDE="-I/usr/include/$i" break; fi From 80880c6c57a6dd1807c5ca6ebdecc290d08fe8f0 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 1 Aug 2024 09:44:55 -0500 Subject: [PATCH 052/198] fix tcl.hh to tcl.h in configure.ac --- configure | 985 ++++++++++++++++++++++----------------------------- configure.ac | 2 +- 2 files changed, 434 insertions(+), 553 deletions(-) diff --git a/configure b/configure index 32ad3975c..3168704f3 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72. +# Generated by GNU Autoconf 2.71. # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, # Inc. # # @@ -15,6 +15,7 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -23,13 +24,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else case e in #( - e) case `(set -o) 2>/dev/null` in #( +else $as_nop + case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi @@ -101,7 +101,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as 'sh COMMAND' +# We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -131,14 +131,15 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed 'exec'. +# out after a failed `exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh NULLCMD=: @@ -146,13 +147,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else case e in #( - e) case \`(set -o) 2>/dev/null\` in #( +else \$as_nop + case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi " @@ -170,9 +170,8 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : -else case e in #( - e) exitcode=1; echo positional parameters were not saved. ;; -esac +else \$as_nop + exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 blah=\$(echo \$(echo blah)) @@ -185,15 +184,14 @@ test -x / || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes -else case e in #( - e) as_have_required=no ;; -esac +else $as_nop + as_have_required=no fi if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null then : -else case e in #( - e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else $as_nop + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do @@ -226,13 +224,12 @@ IFS=$as_save_IFS if $as_found then : -else case e in #( - e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null then : CONFIG_SHELL=$SHELL as_have_required=yes -fi ;; -esac +fi fi @@ -254,7 +251,7 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed 'exec'. +# out after a failed `exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -273,8 +270,7 @@ $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." fi exit 1 -fi ;; -esac +fi fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -313,6 +309,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -381,12 +385,11 @@ then : { eval $1+=\$2 }' -else case e in #( - e) as_fn_append () +else $as_nop + as_fn_append () { eval $1=\$$1\$2 - } ;; -esac + } fi # as_fn_append # as_fn_arith ARG... @@ -400,14 +403,21 @@ then : { as_val=$(( $* )) }' -else case e in #( - e) as_fn_arith () +else $as_nop + as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } ;; -esac + } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -481,8 +491,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' - t clear - :clear s/[$]LINENO.*/&-/ t lineno b @@ -531,6 +539,7 @@ esac as_echo='printf %s\n' as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -542,9 +551,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. - # In both cases, we have to default to 'cp -pR'. + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -569,12 +578,10 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -as_tr_sh="eval sed '$as_sed_sh'" # deprecated +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" test -n "$DJDIR" || exec 7<&0 /dev/null && - as_fn_error $? "invalid feature name: '$ac_useropt'" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -957,7 +964,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: '$ac_useropt'" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1170,7 +1177,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: '$ac_useropt'" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1186,7 +1193,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: '$ac_useropt'" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1216,8 +1223,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: '$ac_option' -Try '$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1225,7 +1232,7 @@ Try '$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: '$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1275,7 +1282,7 @@ do as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: '$host' +# There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -1343,7 +1350,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -1371,7 +1378,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures this package to adapt to many kinds of systems. +\`configure' configures this package to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1385,11 +1392,11 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print 'checking ...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for '--cache-file=config.cache' + -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or '..'] + --srcdir=DIR find the sources in DIR [configure dir or \`..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1397,10 +1404,10 @@ Installation directories: --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, 'make install' will install all the files in -'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify -an installation prefix other than '$ac_default_prefix' using '--prefix', -for instance '--prefix=\$HOME'. +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. For better control, use the options below. @@ -1539,7 +1546,7 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory -Use these variables to override the choices made by 'configure' or to help +Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to the package provider. @@ -1607,9 +1614,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.72 +generated by GNU Autoconf 2.71 -Copyright (C) 2023 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1648,12 +1655,11 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + ac_retval=1 fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1672,8 +1678,8 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> @@ -1681,12 +1687,10 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac +else $as_nop + eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -1726,12 +1730,11 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + ac_retval=1 fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -1767,7 +1770,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.72. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2013,10 +2016,10 @@ esac printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See 'config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2052,7 +2055,9 @@ struct stat; /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (char **p, int i) +static char *e (p, i) + char **p; + int i; { return p[i]; } @@ -2066,21 +2071,6 @@ static char *f (char * (*g) (char **, int), char **p, ...) return s; } -/* C89 style stringification. */ -#define noexpand_stringify(a) #a -const char *stringified = noexpand_stringify(arbitrary+token=sequence); - -/* C89 style token pasting. Exercises some of the corner cases that - e.g. old MSVC gets wrong, but not very hard. */ -#define noexpand_concat(a,b) a##b -#define expand_concat(a,b) noexpand_concat(a,b) -extern int vA; -extern int vbee; -#define aye A -#define bee B -int *pvA = &expand_concat(v,aye); -int *pvbee = &noexpand_concat(v,bee); - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not \xHH hex character constants. These do not provoke an error unfortunately, instead are silently treated @@ -2108,19 +2098,16 @@ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); # Test code for whether the C compiler supports C99 (global declarations) ac_c_conftest_c99_globals=' -/* Does the compiler advertise C99 conformance? */ +// Does the compiler advertise C99 conformance? #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L # error "Compiler does not advertise C99 conformance" #endif -// See if C++-style comments work. - #include extern int puts (const char *); extern int printf (const char *, ...); extern int dprintf (int, const char *, ...); extern void *malloc (size_t); -extern void free (void *); // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare @@ -2170,6 +2157,7 @@ typedef const char *ccp; static inline int test_restrict (ccp restrict text) { + // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) @@ -2235,8 +2223,6 @@ ac_c_conftest_c99_main=' ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; - // Work around memory leak warnings. - free (ia); // Check named initializers. struct named_init ni = { @@ -2258,7 +2244,7 @@ ac_c_conftest_c99_main=' # Test code for whether the C compiler supports C11 (global declarations) ac_c_conftest_c11_globals=' -/* Does the compiler advertise C11 conformance? */ +// Does the compiler advertise C11 conformance? #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L # error "Compiler does not advertise C11 conformance" #endif @@ -2381,12 +2367,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2395,18 +2381,18 @@ printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -2422,11 +2408,11 @@ printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## @@ -2464,8 +2450,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2487,8 +2473,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2510,8 +2495,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2533,8 +2518,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2569,8 +2553,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2592,8 +2576,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2615,8 +2598,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -2655,8 +2638,7 @@ if test $ac_prog_rejected = yes; then ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2680,8 +2662,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2703,8 +2685,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2730,8 +2711,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2753,8 +2734,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2792,8 +2772,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2815,8 +2795,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2838,8 +2817,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2861,8 +2840,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2891,10 +2869,10 @@ fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See 'config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2966,8 +2944,8 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. -# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -2987,7 +2965,7 @@ do ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an '-o' + # safe: cross compilers may not add the suffix if given an `-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -2998,9 +2976,8 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else case e in #( - e) ac_file='' ;; -esac +else $as_nop + ac_file='' fi if test -z "$ac_file" then : @@ -3009,14 +2986,13 @@ printf "%s\n" "no" >&6; } printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See 'config.log' for more details" "$LINENO" 5; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 printf %s "checking for C compiler default output file name... " >&6; } @@ -3040,10 +3016,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) -# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will -# work properly (i.e., refer to 'conftest.exe'), while it won't with -# 'rm'. + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -3053,12 +3029,11 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else case e in #( - e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See 'config.log' for more details" "$LINENO" 5; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3074,8 +3049,6 @@ int main (void) { FILE *f = fopen ("conftest.out", "w"); - if (!f) - return 1; return ferror (f) || fclose (f) != 0; ; @@ -3115,27 +3088,26 @@ printf "%s\n" "$ac_try_echo"; } >&5 if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use '--host'. -See 'config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext \ - conftest.o conftest.obj conftest.out +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } if test ${ac_cv_objext+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3167,18 +3139,16 @@ then : break;; esac done -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See 'config.log' for more details" "$LINENO" 5; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; -esac +rm -f conftest.$ac_cv_objext conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 printf "%s\n" "$ac_cv_objext" >&6; } @@ -3189,8 +3159,8 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } if test ${ac_cv_c_compiler_gnu+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3207,14 +3177,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes -else case e in #( - e) ac_compiler_gnu=no ;; -esac +else $as_nop + ac_compiler_gnu=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } @@ -3232,8 +3200,8 @@ printf %s "checking whether $CC accepts -g... " >&6; } if test ${ac_cv_prog_cc_g+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_save_c_werror_flag=$ac_c_werror_flag +else $as_nop + ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -3251,8 +3219,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes -else case e in #( - e) CFLAGS="" +else $as_nop + CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3267,8 +3235,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else case e in #( - e) ac_c_werror_flag=$ac_save_c_werror_flag +else $as_nop + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3285,15 +3253,12 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag ;; -esac + ac_c_werror_flag=$ac_save_c_werror_flag fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 printf "%s\n" "$ac_cv_prog_cc_g" >&6; } @@ -3320,8 +3285,8 @@ printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c11=no +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3338,28 +3303,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c11" = x +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" ;; -esac + CC="$CC $ac_cv_prog_cc_c11" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 ;; -esac + ac_prog_cc_stdc=c11 fi fi if test x$ac_prog_cc_stdc = xno @@ -3369,8 +3331,8 @@ printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c99=no +else $as_nop + ac_cv_prog_cc_c99=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3387,28 +3349,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c99" = x +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" ;; -esac + CC="$CC $ac_cv_prog_cc_c99" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 ;; -esac + ac_prog_cc_stdc=c99 fi fi if test x$ac_prog_cc_stdc = xno @@ -3418,8 +3377,8 @@ printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c89=no +else $as_nop + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3436,28 +3395,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c89" = x +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" ;; -esac + CC="$CC $ac_cv_prog_cc_c89" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 ;; -esac + ac_prog_cc_stdc=c89 fi fi @@ -3519,14 +3475,13 @@ then : printf "%s\n" "DUPLICATE_PATHS=$with_duplicatePaths" >&6; } printf "%s\n" "#define DUPLICATE_PATHS \"$with_duplicatePaths\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DUPLICATE_PATHS=$withval" >&5 printf "%s\n" "DUPLICATE_PATHS=$withval" >&6; } DUPLICATE_PATHS="$withval" printf "%s\n" "#define DUPLICATE_PATHS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3541,14 +3496,13 @@ then : printf "%s\n" "LMOD_ALLOW_ROOT_USE=$with_allowRootUse" >&6; } printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$with_allowRootUse\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_ALLOW_ROOT_USE=$withval" >&5 printf "%s\n" "LMOD_ALLOW_ROOT_USE=$withval" >&6; } LMOD_ALLOW_ROOT_USE="$withval" printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3561,14 +3515,13 @@ then : printf "%s\n" "SITE_MSG_FILE=$with_siteMsgFile" >&6; } printf "%s\n" "#define SITE_MSG_FILE \"$with_siteMsgFile\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_MSG_FILE=$withval" >&5 printf "%s\n" "SITE_MSG_FILE=$withval" >&6; } SITE_MSG_FILE="$withval" printf "%s\n" "#define SITE_MSG_FILE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3581,14 +3534,13 @@ then : printf "%s\n" "LMOD_OVERRIDE_LANG=$with_lang" >&6; } printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$with_lang\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_OVERRIDE_LANG=$withval" >&5 printf "%s\n" "LMOD_OVERRIDE_LANG=$withval" >&6; } LMOD_OVERRIDE_LANG="$withval" printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3603,14 +3555,13 @@ then : printf "%s\n" "CASE_INDEPENDENT_SORTING=$with_caseIndependentSorting" >&6; } printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$with_caseIndependentSorting\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CASE_INDEPENDENT_SORTING=$withval" >&5 printf "%s\n" "CASE_INDEPENDENT_SORTING=$withval" >&6; } CASE_INDEPENDENT_SORTING="$withval" printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3625,14 +3576,13 @@ then : printf "%s\n" "COLORIZE=$with_colorize" >&6; } printf "%s\n" "#define COLORIZE \"$with_colorize\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: COLORIZE=$withval" >&5 printf "%s\n" "COLORIZE=$withval" >&6; } COLORIZE="$withval" printf "%s\n" "#define COLORIZE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3647,14 +3597,13 @@ then : printf "%s\n" "DYNAMIC_SPIDER_CACHE=$with_dynamicSpiderCache" >&6; } printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$with_dynamicSpiderCache\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DYNAMIC_SPIDER_CACHE=$withval" >&5 printf "%s\n" "DYNAMIC_SPIDER_CACHE=$withval" >&6; } DYNAMIC_SPIDER_CACHE="$withval" printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3669,14 +3618,13 @@ then : printf "%s\n" "HIDDEN_ITALIC=$with_hiddenItalic" >&6; } printf "%s\n" "#define HIDDEN_ITALIC \"$with_hiddenItalic\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HIDDEN_ITALIC=$withval" >&5 printf "%s\n" "HIDDEN_ITALIC=$withval" >&6; } HIDDEN_ITALIC="$withval" printf "%s\n" "#define HIDDEN_ITALIC \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3691,14 +3639,13 @@ then : printf "%s\n" "EXACT_MATCH=$with_exactMatch" >&6; } printf "%s\n" "#define EXACT_MATCH \"$with_exactMatch\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXACT_MATCH=$withval" >&5 printf "%s\n" "EXACT_MATCH=$withval" >&6; } EXACT_MATCH="$withval" printf "%s\n" "#define EXACT_MATCH \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3712,14 +3659,13 @@ then : printf "%s\n" "MODE=$with_mode" >&6; } printf "%s\n" "#define MODE \"$with_mode\"" >>confdefs.h -else case e in #( - e) withval="user_default" +else $as_nop + withval="user_default" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODE=$withval" >&5 printf "%s\n" "MODE=$withval" >&6; } MODE="$withval" printf "%s\n" "#define MODE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3732,14 +3678,13 @@ then : printf "%s\n" "LMOD_CONFIG_DIR=$with_lmodConfigDir" >&6; } printf "%s\n" "#define LMOD_CONFIG_DIR \"$with_lmodConfigDir\"" >>confdefs.h -else case e in #( - e) withval="/etc/lmod" +else $as_nop + withval="/etc/lmod" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_CONFIG_DIR=$withval" >&5 printf "%s\n" "LMOD_CONFIG_DIR=$withval" >&6; } LMOD_CONFIG_DIR="$withval" printf "%s\n" "#define LMOD_CONFIG_DIR \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3754,14 +3699,13 @@ then : printf "%s\n" "AUTO_SWAP=$with_autoSwap" >&6; } printf "%s\n" "#define AUTO_SWAP \"$with_autoSwap\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AUTO_SWAP=$withval" >&5 printf "%s\n" "AUTO_SWAP=$withval" >&6; } AUTO_SWAP="$withval" printf "%s\n" "#define AUTO_SWAP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3778,14 +3722,13 @@ then : printf "%s\n" "EXPORT_MODULE=$with_exportedModuleCmd" >&6; } printf "%s\n" "#define EXPORT_MODULE \"$with_exportedModuleCmd\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXPORT_MODULE=$withval" >&5 printf "%s\n" "EXPORT_MODULE=$withval" >&6; } EXPORT_MODULE="$withval" printf "%s\n" "#define EXPORT_MODULE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3800,14 +3743,13 @@ then : printf "%s\n" "REDIRECT=$with_redirect" >&6; } printf "%s\n" "#define REDIRECT \"$with_redirect\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: REDIRECT=$withval" >&5 printf "%s\n" "REDIRECT=$withval" >&6; } REDIRECT="$withval" printf "%s\n" "#define REDIRECT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3819,14 +3761,13 @@ then : printf "%s\n" "MODULEPATH_ROOT=$with_module_root_path" >&6; } printf "%s\n" "#define MODULEPATH_ROOT \"$with_module_root_path\"" >>confdefs.h -else case e in #( - e) withval="$prefix/modulefiles" +else $as_nop + withval="$prefix/modulefiles" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_ROOT=$withval" >&5 printf "%s\n" "MODULEPATH_ROOT=$withval" >&6; } MODULEPATH_ROOT="$withval" printf "%s\n" "#define MODULEPATH_ROOT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3839,14 +3780,13 @@ then : printf "%s\n" "ANCIENT=$with_ancient" >&6; } printf "%s\n" "#define ANCIENT \"$with_ancient\"" >>confdefs.h -else case e in #( - e) withval="86400" +else $as_nop + withval="86400" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ANCIENT=$withval" >&5 printf "%s\n" "ANCIENT=$withval" >&6; } ANCIENT="$withval" printf "%s\n" "#define ANCIENT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3859,14 +3799,13 @@ then : printf "%s\n" "SHORT_TIME=$with_shortTime" >&6; } printf "%s\n" "#define SHORT_TIME \"$with_shortTime\"" >>confdefs.h -else case e in #( - e) withval="2" +else $as_nop + withval="2" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SHORT_TIME=$withval" >&5 printf "%s\n" "SHORT_TIME=$withval" >&6; } SHORT_TIME="$withval" printf "%s\n" "#define SHORT_TIME \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3879,14 +3818,13 @@ then : printf "%s\n" "SPIDER_CACHE_DIRS=$with_spiderCacheDir" >&6; } printf "%s\n" "#define SPIDER_CACHE_DIRS \"$with_spiderCacheDir\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DIRS=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DIRS=$withval" >&6; } SPIDER_CACHE_DIRS="$withval" printf "%s\n" "#define SPIDER_CACHE_DIRS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3899,14 +3837,13 @@ then : printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$with_spiderCacheDescript" >&6; } printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$with_spiderCacheDescript\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DESCRIPT_FN=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$withval" >&6; } SPIDER_CACHE_DESCRIPT_FN="$withval" printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3919,14 +3856,13 @@ then : printf "%s\n" "UPDATE_SYSTEM_FN=$with_updateSystemFn" >&6; } printf "%s\n" "#define UPDATE_SYSTEM_FN \"$with_updateSystemFn\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: UPDATE_SYSTEM_FN=$withval" >&5 printf "%s\n" "UPDATE_SYSTEM_FN=$withval" >&6; } UPDATE_SYSTEM_FN="$withval" printf "%s\n" "#define UPDATE_SYSTEM_FN \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3939,14 +3875,13 @@ then : printf "%s\n" "PREPEND_BLOCK=$with_prependBlock" >&6; } printf "%s\n" "#define PREPEND_BLOCK \"$with_prependBlock\"" >>confdefs.h -else case e in #( - e) withval="normal" +else $as_nop + withval="normal" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PREPEND_BLOCK=$withval" >&5 printf "%s\n" "PREPEND_BLOCK=$withval" >&6; } PREPEND_BLOCK="$withval" printf "%s\n" "#define PREPEND_BLOCK \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3959,14 +3894,13 @@ then : printf "%s\n" "SITE_NAME=$with_siteName" >&6; } printf "%s\n" "#define SITE_NAME \"$with_siteName\"" >>confdefs.h -else case e in #( - e) withval='' +else $as_nop + withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_NAME=$withval" >&5 printf "%s\n" "SITE_NAME=$withval" >&6; } SITE_NAME="$withval" printf "%s\n" "#define SITE_NAME \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3979,14 +3913,13 @@ then : printf "%s\n" "SYSHOST=$with_syshost" >&6; } printf "%s\n" "#define SYSHOST \"$with_syshost\"" >>confdefs.h -else case e in #( - e) withval='' +else $as_nop + withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SYSHOST=$withval" >&5 printf "%s\n" "SYSHOST=$withval" >&6; } SYSHOST="$withval" printf "%s\n" "#define SYSHOST \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4001,14 +3934,13 @@ then : printf "%s\n" "ALLOW_TCL_MFILES==$withval" >&6; } printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ALLOW_TCL_MFILES=$withval" >&5 printf "%s\n" "ALLOW_TCL_MFILES=$withval" >&6; } ALLOW_TCL_MFILES="$withval" printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4023,14 +3955,13 @@ then : printf "%s\n" "DISABLE_NAME_AUTOSWAP==$withval" >&6; } printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DISABLE_NAME_AUTOSWAP=$withval" >&5 printf "%s\n" "DISABLE_NAME_AUTOSWAP=$withval" >&6; } DISABLE_NAME_AUTOSWAP="$withval" printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4045,14 +3976,13 @@ then : printf "%s\n" "MPATH_AVAIL==$withval" >&6; } printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MPATH_AVAIL=$withval" >&5 printf "%s\n" "MPATH_AVAIL=$withval" >&6; } MPATH_AVAIL="$withval" printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4067,14 +3997,13 @@ then : printf "%s\n" "SETTARG=$with_settarg" >&6; } printf "%s\n" "#define SETTARG \"$with_settarg\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SETTARG=$withval" >&5 printf "%s\n" "SETTARG=$withval" >&6; } SETTARG="$withval" printf "%s\n" "#define SETTARG \"$withval\"" >>confdefs.h - ;; -esac + fi DFLT_IGNORE_DIRS=".svn,.git,.hg,.bzr" @@ -4089,14 +4018,13 @@ then : printf "%s\n" "IGNORE_DIRS=$with_ignoreDirs" >&6; } printf "%s\n" "#define IGNORE_DIRS \"$with_ignoreDirs\"" >>confdefs.h -else case e in #( - e) withval="$DFLT_IGNORE_DIRS" +else $as_nop + withval="$DFLT_IGNORE_DIRS" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IGNORE_DIRS=$withval" >&5 printf "%s\n" "IGNORE_DIRS=$withval" >&6; } IGNORE_DIRS="$withval" printf "%s\n" "#define IGNORE_DIRS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4111,14 +4039,13 @@ then : printf "%s\n" "PIN_VERSIONS=$with_pinVersions" >&6; } printf "%s\n" "#define PIN_VERSIONS \"$with_pinVersions\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PIN_VERSIONS=$withval" >&5 printf "%s\n" "PIN_VERSIONS=$withval" >&6; } PIN_VERSIONS="$withval" printf "%s\n" "#define PIN_VERSIONS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4133,14 +4060,13 @@ then : printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$with_downstreamConflicts" >&6; } printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$with_downstreamConflicts\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_DOWNSTREAM_CONFLICTS=$withval" >&5 printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$withval" >&6; } LMOD_DOWNSTREAM_CONFLICTS="$withval" printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4155,14 +4081,13 @@ then : printf "%s\n" "MODULES_AUTO_HANDLING=$with_modulesAutoHandling" >&6; } printf "%s\n" "#define MODULES_AUTO_HANDLING \"$with_modulesAutoHandling\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULES_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULES_AUTO_HANDLING=$withval" >&6; } MODULES_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULES_AUTO_HANDLING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4177,14 +4102,13 @@ then : printf "%s\n" "TMOD_PATH_RULE=$with_tmodPathRule" >&6; } printf "%s\n" "#define TMOD_PATH_RULE \"$with_tmodPathRule\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_PATH_RULE=$withval" >&5 printf "%s\n" "TMOD_PATH_RULE=$withval" >&6; } TMOD_PATH_RULE="$withval" printf "%s\n" "#define TMOD_PATH_RULE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4199,14 +4123,13 @@ then : printf "%s\n" "TMOD_FIND_FIRST=$with_tmodFindFirst" >&6; } printf "%s\n" "#define TMOD_FIND_FIRST \"$with_tmodFindFirst\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_FIND_FIRST=$withval" >&5 printf "%s\n" "TMOD_FIND_FIRST=$withval" >&6; } TMOD_FIND_FIRST="$withval" printf "%s\n" "#define TMOD_FIND_FIRST \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4219,14 +4142,13 @@ then : printf "%s\n" "LUA_INCLUDE=$with_lua_include" >&6; } printf "%s\n" "#define LUA_INCLUDE \"$with_lua_include\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_INCLUDE=$withval" >&5 printf "%s\n" "LUA_INCLUDE=$withval" >&6; } LUA_INCLUDE="$withval" printf "%s\n" "#define LUA_INCLUDE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4241,14 +4163,13 @@ then : printf "%s\n" "CACHED_LOADS=$with_cachedLoads" >&6; } printf "%s\n" "#define CACHED_LOADS \"$with_cachedLoads\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CACHED_LOADS=$withval" >&5 printf "%s\n" "CACHED_LOADS=$withval" >&6; } CACHED_LOADS="$withval" printf "%s\n" "#define CACHED_LOADS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4263,14 +4184,13 @@ then : printf "%s\n" "EXTENDED_DEFAULT=$with_extendedDefault" >&6; } printf "%s\n" "#define EXTENDED_DEFAULT \"$with_extendedDefault\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXTENDED_DEFAULT=$withval" >&5 printf "%s\n" "EXTENDED_DEFAULT=$withval" >&6; } EXTENDED_DEFAULT="$withval" printf "%s\n" "#define EXTENDED_DEFAULT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4285,14 +4205,13 @@ then : printf "%s\n" "SUPPORT_KSH=$with_supportKsh" >&6; } printf "%s\n" "#define SUPPORT_KSH \"$with_supportKsh\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SUPPORT_KSH=$withval" >&5 printf "%s\n" "SUPPORT_KSH=$withval" >&6; } SUPPORT_KSH="$withval" printf "%s\n" "#define SUPPORT_KSH \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4305,14 +4224,13 @@ then : printf "%s\n" "MODULEPATH_INIT=$with_ModulePathInit" >&6; } printf "%s\n" "#define MODULEPATH_INIT \"$with_ModulePathInit\"" >>confdefs.h -else case e in #( - e) withval="@PKG@/init/.modulespath" +else $as_nop + withval="@PKG@/init/.modulespath" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_INIT=$withval" >&5 printf "%s\n" "MODULEPATH_INIT=$withval" >&6; } MODULEPATH_INIT="$withval" printf "%s\n" "#define MODULEPATH_INIT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4327,14 +4245,13 @@ then : printf "%s\n" "SITE_CONTROLLED_PREFIX=$with_siteControlPrefix" >&6; } printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$with_siteControlPrefix\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_CONTROLLED_PREFIX=$withval" >&5 printf "%s\n" "SITE_CONTROLLED_PREFIX=$withval" >&6; } SITE_CONTROLLED_PREFIX="$withval" printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4349,14 +4266,13 @@ then : printf "%s\n" "USE_BUILT_IN_PKGS=$with_useBuiltinPkgs" >&6; } printf "%s\n" "#define USE_BUILT_IN_PKGS \"$with_useBuiltinPkgs\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_BUILT_IN_PKGS=$withval" >&5 printf "%s\n" "USE_BUILT_IN_PKGS=$withval" >&6; } USE_BUILT_IN_PKGS="$withval" printf "%s\n" "#define USE_BUILT_IN_PKGS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4371,14 +4287,13 @@ then : printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$with_useDotConfigDirOnly" >&6; } printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$with_useDotConfigDirOnly\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_DOT_CONFIG_DIR_ONLY=$withval" >&5 printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$withval" >&6; } USE_DOT_CONFIG_DIR_ONLY="$withval" printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4393,14 +4308,13 @@ then : printf "%s\n" "SILENCE_SHELL_DEBUGGING=$with_silentShellDebugging" >&6; } printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$with_silentShellDebugging\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SILENCE_SHELL_DEBUGGING=$withval" >&5 printf "%s\n" "SILENCE_SHELL_DEBUGGING=$withval" >&6; } SILENCE_SHELL_DEBUGGING="$withval" printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4415,14 +4329,13 @@ then : printf "%s\n" "FAST_TCL_INTERP=$with_fastTCLInterp" >&6; } printf "%s\n" "#define FAST_TCL_INTERP \"$with_fastTCLInterp\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FAST_TCL_INTERP=$withval" >&5 printf "%s\n" "FAST_TCL_INTERP=$withval" >&6; } FAST_TCL_INTERP="$withval" printf "%s\n" "#define FAST_TCL_INTERP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4437,14 +4350,13 @@ then : printf "%s\n" "MODULE_AUTO_HANDLING=$with-moduleAutoHandling" >&6; } printf "%s\n" "#define MODULE_AUTO_HANDLING \"$with-moduleAutoHandling\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULE_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULE_AUTO_HANDLING=$withval" >&6; } MODULE_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULE_AUTO_HANDLING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4459,14 +4371,13 @@ then : printf "%s\n" "AVAIL_EXTENSIONS=$with_availExtensions" >&6; } printf "%s\n" "#define AVAIL_EXTENSIONS \"$with_availExtensions\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AVAIL_EXTENSIONS=$withval" >&5 printf "%s\n" "AVAIL_EXTENSIONS=$withval" >&6; } AVAIL_EXTENSIONS="$withval" printf "%s\n" "#define AVAIL_EXTENSIONS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4484,14 +4395,13 @@ then : printf "%s\n" "PATH_TO_LUA=$with_lua" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$with_lua\"" >>confdefs.h -else case e in #( - e) withval="lua" +else $as_nop + withval="lua" PATH_TO_LUA="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$withval" >&5 printf "%s\n" "PATH_TO_LUA=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4509,14 +4419,13 @@ then : printf "%s\n" "PATH_TO_LUAC=$with_luac" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$with_luac\"" >>confdefs.h -else case e in #( - e) withval="luac" +else $as_nop + withval="luac" PATH_TO_LUAC="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$withval" >&5 printf "%s\n" "PATH_TO_LUAC=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4531,14 +4440,13 @@ then : printf "%s\n" "LUA_SUFFIX=$with_luaSuffic" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$with_luaSuffix\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" LUA_SUFFIX="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_SUFFIX=$withval" >&5 printf "%s\n" "LUA_SUFFIX=$withval" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$withval\"" >>confdefs.h - ;; -esac + fi if test "$ALLOW_TCL_MFILES" = no ; then @@ -4552,7 +4460,7 @@ if test "$FAST_TCL_INTERP" = yes ; then TCL_INCLUDE="-I${DIR}/usr/include" else for i in "" tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do - if test -f /usr/include/$i/tcl.hh ; then + if test -f /usr/include/$i/tcl.h ; then TCL_INCLUDE="-I/usr/include/$i" break; fi @@ -4567,8 +4475,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $pkgConfig in +else $as_nop + case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -4594,7 +4502,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; -esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -4673,21 +4580,15 @@ printf %s "checking for library containing Tcl_CreateInterp... " >&6; } if test ${ac_cv_search_Tcl_CreateInterp+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char Tcl_CreateInterp (void); + builtin and then its argument prototype would still apply. */ +char Tcl_CreateInterp (); int main (void) { @@ -4718,13 +4619,11 @@ done if test ${ac_cv_search_Tcl_CreateInterp+y} then : -else case e in #( - e) ac_cv_search_Tcl_CreateInterp=no ;; -esac +else $as_nop + ac_cv_search_Tcl_CreateInterp=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_Tcl_CreateInterp" >&5 printf "%s\n" "$ac_cv_search_Tcl_CreateInterp" >&6; } @@ -4733,9 +4632,8 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else case e in #( - e) rm -f makefile; as_fn_error $? "Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" "$LINENO" 5 ;; -esac +else $as_nop + rm -f makefile; as_fn_error $? "Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" "$LINENO" 5 fi @@ -4792,8 +4690,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PS+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PS in +else $as_nop + case $PS in [\\/]* | ?:[\\/]*) ac_cv_path_PS="$PS" # Let the user override the test with a path. ;; @@ -4819,7 +4717,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PS" && ac_cv_path_PS="UNKNOWN_PS" ;; -esac ;; esac fi PS=$ac_cv_path_PS @@ -4847,8 +4744,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_READLINK+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $READLINK in +else $as_nop + case $READLINK in [\\/]* | ?:[\\/]*) ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path. ;; @@ -4874,7 +4771,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_READLINK" && ac_cv_path_READLINK="UNKNOWN_READLINK" ;; -esac ;; esac fi READLINK=$ac_cv_path_READLINK @@ -4904,8 +4800,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_EXPR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $EXPR in +else $as_nop + case $EXPR in [\\/]* | ?:[\\/]*) ac_cv_path_EXPR="$EXPR" # Let the user override the test with a path. ;; @@ -4930,7 +4826,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi EXPR=$ac_cv_path_EXPR @@ -4964,8 +4859,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BASENAME+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $BASENAME in +else $as_nop + case $BASENAME in [\\/]* | ?:[\\/]*) ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path. ;; @@ -4990,7 +4885,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi BASENAME=$ac_cv_path_BASENAME @@ -5024,8 +4918,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $BC in +else $as_nop + case $BC in [\\/]* | ?:[\\/]*) ac_cv_path_BC="$BC" # Let the user override the test with a path. ;; @@ -5050,7 +4944,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi BC=$ac_cv_path_BC @@ -5082,8 +4975,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_POD2MAN+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_POD2MAN in +else $as_nop + case $PATH_TO_POD2MAN in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_POD2MAN="$PATH_TO_POD2MAN" # Let the user override the test with a path. ;; @@ -5109,7 +5002,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_POD2MAN" && ac_cv_path_PATH_TO_POD2MAN="UNKNOWN_POD2MAN" ;; -esac ;; esac fi PATH_TO_POD2MAN=$ac_cv_path_PATH_TO_POD2MAN @@ -5130,8 +5022,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_GIT+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_GIT in +else $as_nop + case $PATH_TO_GIT in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_GIT="$PATH_TO_GIT" # Let the user override the test with a path. ;; @@ -5157,7 +5049,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_GIT" && ac_cv_path_PATH_TO_GIT="""" ;; -esac ;; esac fi PATH_TO_GIT=$ac_cv_path_PATH_TO_GIT @@ -5179,8 +5070,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_PAGER+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_PAGER in +else $as_nop + case $PATH_TO_PAGER in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_PAGER="$PATH_TO_PAGER" # Let the user override the test with a path. ;; @@ -5205,7 +5096,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_PAGER=$ac_cv_path_PATH_TO_PAGER @@ -5232,8 +5122,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_HASHSUM+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_HASHSUM in +else $as_nop + case $PATH_TO_HASHSUM in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_HASHSUM="$PATH_TO_HASHSUM" # Let the user override the test with a path. ;; @@ -5258,7 +5148,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_HASHSUM=$ac_cv_path_PATH_TO_HASHSUM @@ -5292,8 +5181,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TCLSH+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_TCLSH in +else $as_nop + case $PATH_TO_TCLSH in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TCLSH="$PATH_TO_TCLSH" # Let the user override the test with a path. ;; @@ -5319,7 +5208,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_TCLSH" && ac_cv_path_PATH_TO_TCLSH="UNKNOWN_TCLSH" ;; -esac ;; esac fi PATH_TO_TCLSH=$ac_cv_path_PATH_TO_TCLSH @@ -5348,8 +5236,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_TR in +else $as_nop + case $PATH_TO_TR in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TR="$PATH_TO_TR" # Let the user override the test with a path. ;; @@ -5374,7 +5262,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_TR=$ac_cv_path_PATH_TO_TR @@ -5400,8 +5287,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_LS+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_LS in +else $as_nop + case $PATH_TO_LS in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_LS="$PATH_TO_LS" # Let the user override the test with a path. ;; @@ -5426,7 +5313,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_LS=$ac_cv_path_PATH_TO_LS @@ -5492,8 +5378,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUA+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $FIND_PATH_TO_LUA in +else $as_nop + case $FIND_PATH_TO_LUA in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUA="$FIND_PATH_TO_LUA" # Let the user override the test with a path. ;; @@ -5518,7 +5404,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi FIND_PATH_TO_LUA=$ac_cv_path_FIND_PATH_TO_LUA @@ -5548,8 +5433,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUAC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $FIND_PATH_TO_LUAC in +else $as_nop + case $FIND_PATH_TO_LUAC in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUAC="$FIND_PATH_TO_LUAC" # Let the user override the test with a path. ;; @@ -5574,7 +5459,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi FIND_PATH_TO_LUAC=$ac_cv_path_FIND_PATH_TO_LUAC @@ -5721,8 +5605,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $pkgConfig in +else $as_nop + case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -5748,7 +5632,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; -esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -5818,8 +5701,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ZSH+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $ZSH in +else $as_nop + case $ZSH in [\\/]* | ?:[\\/]*) ac_cv_path_ZSH="$ZSH" # Let the user override the test with a path. ;; @@ -5844,7 +5727,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi ZSH=$ac_cv_path_ZSH @@ -5928,8 +5810,8 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# 'ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* 'ac_cv_foo' will be assigned the +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. _ACEOF @@ -5959,14 +5841,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # 'set' does not quote correctly, so add quotes: double-quote + # `set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # 'set' quotes correctly as required by POSIX, so do not add quotes. + # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -6030,7 +5912,9 @@ s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g t quote b any :quote -s/[][ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g s/\$/$$/g H :any @@ -6090,6 +5974,7 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -6098,13 +5983,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else case e in #( - e) case `(set -o) 2>/dev/null` in #( +else $as_nop + case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi @@ -6176,7 +6060,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as 'sh COMMAND' +# We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -6205,6 +6089,7 @@ as_fn_error () } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -6244,12 +6129,11 @@ then : { eval $1+=\$2 }' -else case e in #( - e) as_fn_append () +else $as_nop + as_fn_append () { eval $1=\$$1\$2 - } ;; -esac + } fi # as_fn_append # as_fn_arith ARG... @@ -6263,12 +6147,11 @@ then : { as_val=$(( $* )) }' -else case e in #( - e) as_fn_arith () +else $as_nop + as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } ;; -esac + } fi # as_fn_arith @@ -6351,9 +6234,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. - # In both cases, we have to default to 'cp -pR'. + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -6434,12 +6317,10 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -as_tr_sh="eval sed '$as_sed_sh'" # deprecated +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" exec 6>&1 @@ -6455,7 +6336,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.72. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6482,7 +6363,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -'$as_me' instantiates files and other configuration actions +\`$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -6510,10 +6391,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.72, +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2023 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -6570,8 +6451,8 @@ do ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: '$1' -Try '$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -6621,7 +6502,7 @@ do case $ac_config_target in "makefile") CONFIG_FILES="$CONFIG_FILES makefile:Makefile.in" ;; - *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -6639,7 +6520,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to '$tmp'. +# after its creation but before its name has been assigned to `$tmp'. $debug || { tmp= ac_tmp= @@ -6663,7 +6544,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with './config.status config.h'. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -6829,7 +6710,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6851,19 +6732,19 @@ do -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain ':'. + # because $ac_f cannot contain `:'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is 'configure' which instantiates (i.e., don't + # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` @@ -6987,7 +6868,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when '$srcdir' = '.'. +# Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -7016,9 +6897,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" diff --git a/configure.ac b/configure.ac index 9f93b27b9..94dc31766 100644 --- a/configure.ac +++ b/configure.ac @@ -707,7 +707,7 @@ if test "$FAST_TCL_INTERP" = yes ; then TCL_INCLUDE="-I${DIR}/usr/include" else for i in "" tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do - if test -f /usr/include/$i/tcl.hh ; then + if test -f /usr/include/$i/tcl.h ; then TCL_INCLUDE="-I/usr/include/$i" break; fi From b866358b1d647deed94e3cb671720d7b100ad636 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 1 Aug 2024 09:48:17 -0500 Subject: [PATCH 053/198] fix pkg-config in configure.ac --- configure | 989 ++++++++++++++++++++++----------------------------- configure.ac | 4 +- init/bash.in | 4 +- 3 files changed, 439 insertions(+), 558 deletions(-) diff --git a/configure b/configure index 32ad3975c..8872ef2ff 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72. +# Generated by GNU Autoconf 2.71. # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation, +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, # Inc. # # @@ -15,6 +15,7 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -23,13 +24,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else case e in #( - e) case `(set -o) 2>/dev/null` in #( +else $as_nop + case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi @@ -101,7 +101,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as 'sh COMMAND' +# We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -131,14 +131,15 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed 'exec'. +# out after a failed `exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh NULLCMD=: @@ -146,13 +147,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else case e in #( - e) case \`(set -o) 2>/dev/null\` in #( +else \$as_nop + case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi " @@ -170,9 +170,8 @@ as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } if ( set x; as_fn_ret_success y && test x = \"\$1\" ) then : -else case e in #( - e) exitcode=1; echo positional parameters were not saved. ;; -esac +else \$as_nop + exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 blah=\$(echo \$(echo blah)) @@ -185,15 +184,14 @@ test -x / || exit 1" if (eval "$as_required") 2>/dev/null then : as_have_required=yes -else case e in #( - e) as_have_required=no ;; -esac +else $as_nop + as_have_required=no fi if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null then : -else case e in #( - e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +else $as_nop + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do @@ -226,13 +224,12 @@ IFS=$as_save_IFS if $as_found then : -else case e in #( - e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null then : CONFIG_SHELL=$SHELL as_have_required=yes -fi ;; -esac +fi fi @@ -254,7 +251,7 @@ case $- in # (((( esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed 'exec'. +# out after a failed `exec'. printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi @@ -273,8 +270,7 @@ $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." fi exit 1 -fi ;; -esac +fi fi fi SHELL=${CONFIG_SHELL-/bin/sh} @@ -313,6 +309,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -381,12 +385,11 @@ then : { eval $1+=\$2 }' -else case e in #( - e) as_fn_append () +else $as_nop + as_fn_append () { eval $1=\$$1\$2 - } ;; -esac + } fi # as_fn_append # as_fn_arith ARG... @@ -400,14 +403,21 @@ then : { as_val=$(( $* )) }' -else case e in #( - e) as_fn_arith () +else $as_nop + as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } ;; -esac + } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -481,8 +491,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits /[$]LINENO/= ' <$as_myself | sed ' - t clear - :clear s/[$]LINENO.*/&-/ t lineno b @@ -531,6 +539,7 @@ esac as_echo='printf %s\n' as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -542,9 +551,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. - # In both cases, we have to default to 'cp -pR'. + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -569,12 +578,10 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -as_tr_sh="eval sed '$as_sed_sh'" # deprecated +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" test -n "$DJDIR" || exec 7<&0 /dev/null && - as_fn_error $? "invalid feature name: '$ac_useropt'" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -957,7 +964,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: '$ac_useropt'" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1170,7 +1177,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: '$ac_useropt'" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1186,7 +1193,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: '$ac_useropt'" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1216,8 +1223,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: '$ac_option' -Try '$0 --help' for more information" + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1225,7 +1232,7 @@ Try '$0 --help' for more information" # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: '$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1275,7 +1282,7 @@ do as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done -# There might be people who depend on the old broken behavior: '$host' +# There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. # FIXME: To remove some day. build=$build_alias @@ -1343,7 +1350,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi -ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work" +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` @@ -1371,7 +1378,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures this package to adapt to many kinds of systems. +\`configure' configures this package to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1385,11 +1392,11 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print 'checking ...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for '--cache-file=config.cache' + -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or '..'] + --srcdir=DIR find the sources in DIR [configure dir or \`..'] Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -1397,10 +1404,10 @@ Installation directories: --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] -By default, 'make install' will install all the files in -'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify -an installation prefix other than '$ac_default_prefix' using '--prefix', -for instance '--prefix=\$HOME'. +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. For better control, use the options below. @@ -1539,7 +1546,7 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory -Use these variables to override the choices made by 'configure' or to help +Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to the package provider. @@ -1607,9 +1614,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.72 +generated by GNU Autoconf 2.71 -Copyright (C) 2023 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1648,12 +1655,11 @@ printf "%s\n" "$ac_try_echo"; } >&5 } && test -s conftest.$ac_objext then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + ac_retval=1 fi eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval @@ -1672,8 +1678,8 @@ printf %s "checking for $2... " >&6; } if eval test \${$3+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> @@ -1681,12 +1687,10 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : eval "$3=yes" -else case e in #( - e) eval "$3=no" ;; -esac +else $as_nop + eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -1726,12 +1730,11 @@ printf "%s\n" "$ac_try_echo"; } >&5 } then : ac_retval=0 -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_retval=1 ;; -esac + ac_retval=1 fi # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would @@ -1767,7 +1770,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.72. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2013,10 +2016,10 @@ esac printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See 'config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2052,7 +2055,9 @@ struct stat; /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (char **p, int i) +static char *e (p, i) + char **p; + int i; { return p[i]; } @@ -2066,21 +2071,6 @@ static char *f (char * (*g) (char **, int), char **p, ...) return s; } -/* C89 style stringification. */ -#define noexpand_stringify(a) #a -const char *stringified = noexpand_stringify(arbitrary+token=sequence); - -/* C89 style token pasting. Exercises some of the corner cases that - e.g. old MSVC gets wrong, but not very hard. */ -#define noexpand_concat(a,b) a##b -#define expand_concat(a,b) noexpand_concat(a,b) -extern int vA; -extern int vbee; -#define aye A -#define bee B -int *pvA = &expand_concat(v,aye); -int *pvbee = &noexpand_concat(v,bee); - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not \xHH hex character constants. These do not provoke an error unfortunately, instead are silently treated @@ -2108,19 +2098,16 @@ ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); # Test code for whether the C compiler supports C99 (global declarations) ac_c_conftest_c99_globals=' -/* Does the compiler advertise C99 conformance? */ +// Does the compiler advertise C99 conformance? #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L # error "Compiler does not advertise C99 conformance" #endif -// See if C++-style comments work. - #include extern int puts (const char *); extern int printf (const char *, ...); extern int dprintf (int, const char *, ...); extern void *malloc (size_t); -extern void free (void *); // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare @@ -2170,6 +2157,7 @@ typedef const char *ccp; static inline int test_restrict (ccp restrict text) { + // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) @@ -2235,8 +2223,6 @@ ac_c_conftest_c99_main=' ia->datasize = 10; for (int i = 0; i < ia->datasize; ++i) ia->data[i] = i * 1.234; - // Work around memory leak warnings. - free (ia); // Check named initializers. struct named_init ni = { @@ -2258,7 +2244,7 @@ ac_c_conftest_c99_main=' # Test code for whether the C compiler supports C11 (global declarations) ac_c_conftest_c11_globals=' -/* Does the compiler advertise C11 conformance? */ +// Does the compiler advertise C11 conformance? #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L # error "Compiler does not advertise C11 conformance" #endif @@ -2381,12 +2367,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2395,18 +2381,18 @@ printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -2422,11 +2408,11 @@ printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file' + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## @@ -2464,8 +2450,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2487,8 +2473,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2510,8 +2495,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2533,8 +2518,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2569,8 +2553,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2592,8 +2576,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2615,8 +2598,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no @@ -2655,8 +2638,7 @@ if test $ac_prog_rejected = yes; then ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2680,8 +2662,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2703,8 +2685,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2730,8 +2711,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2753,8 +2734,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2792,8 +2772,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$CC"; then +else $as_nop + if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2815,8 +2795,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2838,8 +2817,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_prog_ac_ct_CC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) if test -n "$ac_ct_CC"; then +else $as_nop + if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2861,8 +2840,7 @@ done done IFS=$as_save_IFS -fi ;; -esac +fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -2891,10 +2869,10 @@ fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See 'config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2966,8 +2944,8 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. -# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. @@ -2987,7 +2965,7 @@ do ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an '-o' + # safe: cross compilers may not add the suffix if given an `-o' # argument, so we may need to know it at that point already. # Even if this section looks crufty: it has the advantage of # actually working. @@ -2998,9 +2976,8 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else case e in #( - e) ac_file='' ;; -esac +else $as_nop + ac_file='' fi if test -z "$ac_file" then : @@ -3009,14 +2986,13 @@ printf "%s\n" "no" >&6; } printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See 'config.log' for more details" "$LINENO" 5; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 printf %s "checking for C compiler default output file name... " >&6; } @@ -3040,10 +3016,10 @@ printf "%s\n" "$ac_try_echo"; } >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then : - # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) -# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will -# work properly (i.e., refer to 'conftest.exe'), while it won't with -# 'rm'. + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -3053,12 +3029,11 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else case e in #( - e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See 'config.log' for more details" "$LINENO" 5; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3074,8 +3049,6 @@ int main (void) { FILE *f = fopen ("conftest.out", "w"); - if (!f) - return 1; return ferror (f) || fclose (f) != 0; ; @@ -3115,27 +3088,26 @@ printf "%s\n" "$ac_try_echo"; } >&5 if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot run C compiled programs. -If you meant to cross compile, use '--host'. -See 'config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } fi fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 printf "%s\n" "$cross_compiling" >&6; } -rm -f conftest.$ac_ext conftest$ac_cv_exeext \ - conftest.o conftest.obj conftest.out +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 printf %s "checking for suffix of object files... " >&6; } if test ${ac_cv_objext+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3167,18 +3139,16 @@ then : break;; esac done -else case e in #( - e) printf "%s\n" "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See 'config.log' for more details" "$LINENO" 5; } ;; -esac +See \`config.log' for more details" "$LINENO" 5; } fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext ;; -esac +rm -f conftest.$ac_cv_objext conftest.$ac_ext fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 printf "%s\n" "$ac_cv_objext" >&6; } @@ -3189,8 +3159,8 @@ printf %s "checking whether the compiler supports GNU C... " >&6; } if test ${ac_cv_c_compiler_gnu+y} then : printf %s "(cached) " >&6 -else case e in #( - e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3207,14 +3177,12 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_compiler_gnu=yes -else case e in #( - e) ac_compiler_gnu=no ;; -esac +else $as_nop + ac_compiler_gnu=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu - ;; -esac + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } @@ -3232,8 +3200,8 @@ printf %s "checking whether $CC accepts -g... " >&6; } if test ${ac_cv_prog_cc_g+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_save_c_werror_flag=$ac_c_werror_flag +else $as_nop + ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" @@ -3251,8 +3219,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes -else case e in #( - e) CFLAGS="" +else $as_nop + CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3267,8 +3235,8 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : -else case e in #( - e) ac_c_werror_flag=$ac_save_c_werror_flag +else $as_nop + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3285,15 +3253,12 @@ if ac_fn_c_try_compile "$LINENO" then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; -esac +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag ;; -esac + ac_c_werror_flag=$ac_save_c_werror_flag fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 printf "%s\n" "$ac_cv_prog_cc_g" >&6; } @@ -3320,8 +3285,8 @@ printf %s "checking for $CC option to enable C11 features... " >&6; } if test ${ac_cv_prog_cc_c11+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c11=no +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3338,28 +3303,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c11" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c11" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c11" = x +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" ;; -esac + CC="$CC $ac_cv_prog_cc_c11" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 ;; -esac + ac_prog_cc_stdc=c11 fi fi if test x$ac_prog_cc_stdc = xno @@ -3369,8 +3331,8 @@ printf %s "checking for $CC option to enable C99 features... " >&6; } if test ${ac_cv_prog_cc_c99+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c99=no +else $as_nop + ac_cv_prog_cc_c99=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3387,28 +3349,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c99" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c99" = x +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" ;; -esac + CC="$CC $ac_cv_prog_cc_c99" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 ;; -esac + ac_prog_cc_stdc=c99 fi fi if test x$ac_prog_cc_stdc = xno @@ -3418,8 +3377,8 @@ printf %s "checking for $CC option to enable C89 features... " >&6; } if test ${ac_cv_prog_cc_c89+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_cv_prog_cc_c89=no +else $as_nop + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3436,28 +3395,25 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext -CC=$ac_save_CC ;; -esac +CC=$ac_save_CC fi if test "x$ac_cv_prog_cc_c89" = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 printf "%s\n" "unsupported" >&6; } -else case e in #( - e) if test "x$ac_cv_prog_cc_c89" = x +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 printf "%s\n" "none needed" >&6; } -else case e in #( - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" ;; -esac + CC="$CC $ac_cv_prog_cc_c89" fi ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 ;; -esac + ac_prog_cc_stdc=c89 fi fi @@ -3519,14 +3475,13 @@ then : printf "%s\n" "DUPLICATE_PATHS=$with_duplicatePaths" >&6; } printf "%s\n" "#define DUPLICATE_PATHS \"$with_duplicatePaths\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DUPLICATE_PATHS=$withval" >&5 printf "%s\n" "DUPLICATE_PATHS=$withval" >&6; } DUPLICATE_PATHS="$withval" printf "%s\n" "#define DUPLICATE_PATHS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3541,14 +3496,13 @@ then : printf "%s\n" "LMOD_ALLOW_ROOT_USE=$with_allowRootUse" >&6; } printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$with_allowRootUse\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_ALLOW_ROOT_USE=$withval" >&5 printf "%s\n" "LMOD_ALLOW_ROOT_USE=$withval" >&6; } LMOD_ALLOW_ROOT_USE="$withval" printf "%s\n" "#define LMOD_ALLOW_ROOT_USE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3561,14 +3515,13 @@ then : printf "%s\n" "SITE_MSG_FILE=$with_siteMsgFile" >&6; } printf "%s\n" "#define SITE_MSG_FILE \"$with_siteMsgFile\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_MSG_FILE=$withval" >&5 printf "%s\n" "SITE_MSG_FILE=$withval" >&6; } SITE_MSG_FILE="$withval" printf "%s\n" "#define SITE_MSG_FILE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3581,14 +3534,13 @@ then : printf "%s\n" "LMOD_OVERRIDE_LANG=$with_lang" >&6; } printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$with_lang\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_OVERRIDE_LANG=$withval" >&5 printf "%s\n" "LMOD_OVERRIDE_LANG=$withval" >&6; } LMOD_OVERRIDE_LANG="$withval" printf "%s\n" "#define LMOD_OVERRIDE_LANG \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3603,14 +3555,13 @@ then : printf "%s\n" "CASE_INDEPENDENT_SORTING=$with_caseIndependentSorting" >&6; } printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$with_caseIndependentSorting\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CASE_INDEPENDENT_SORTING=$withval" >&5 printf "%s\n" "CASE_INDEPENDENT_SORTING=$withval" >&6; } CASE_INDEPENDENT_SORTING="$withval" printf "%s\n" "#define CASE_INDEPENDENT_SORTING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3625,14 +3576,13 @@ then : printf "%s\n" "COLORIZE=$with_colorize" >&6; } printf "%s\n" "#define COLORIZE \"$with_colorize\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: COLORIZE=$withval" >&5 printf "%s\n" "COLORIZE=$withval" >&6; } COLORIZE="$withval" printf "%s\n" "#define COLORIZE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3647,14 +3597,13 @@ then : printf "%s\n" "DYNAMIC_SPIDER_CACHE=$with_dynamicSpiderCache" >&6; } printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$with_dynamicSpiderCache\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DYNAMIC_SPIDER_CACHE=$withval" >&5 printf "%s\n" "DYNAMIC_SPIDER_CACHE=$withval" >&6; } DYNAMIC_SPIDER_CACHE="$withval" printf "%s\n" "#define DYNAMIC_SPIDER_CACHE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3669,14 +3618,13 @@ then : printf "%s\n" "HIDDEN_ITALIC=$with_hiddenItalic" >&6; } printf "%s\n" "#define HIDDEN_ITALIC \"$with_hiddenItalic\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HIDDEN_ITALIC=$withval" >&5 printf "%s\n" "HIDDEN_ITALIC=$withval" >&6; } HIDDEN_ITALIC="$withval" printf "%s\n" "#define HIDDEN_ITALIC \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3691,14 +3639,13 @@ then : printf "%s\n" "EXACT_MATCH=$with_exactMatch" >&6; } printf "%s\n" "#define EXACT_MATCH \"$with_exactMatch\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXACT_MATCH=$withval" >&5 printf "%s\n" "EXACT_MATCH=$withval" >&6; } EXACT_MATCH="$withval" printf "%s\n" "#define EXACT_MATCH \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3712,14 +3659,13 @@ then : printf "%s\n" "MODE=$with_mode" >&6; } printf "%s\n" "#define MODE \"$with_mode\"" >>confdefs.h -else case e in #( - e) withval="user_default" +else $as_nop + withval="user_default" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODE=$withval" >&5 printf "%s\n" "MODE=$withval" >&6; } MODE="$withval" printf "%s\n" "#define MODE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3732,14 +3678,13 @@ then : printf "%s\n" "LMOD_CONFIG_DIR=$with_lmodConfigDir" >&6; } printf "%s\n" "#define LMOD_CONFIG_DIR \"$with_lmodConfigDir\"" >>confdefs.h -else case e in #( - e) withval="/etc/lmod" +else $as_nop + withval="/etc/lmod" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_CONFIG_DIR=$withval" >&5 printf "%s\n" "LMOD_CONFIG_DIR=$withval" >&6; } LMOD_CONFIG_DIR="$withval" printf "%s\n" "#define LMOD_CONFIG_DIR \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3754,14 +3699,13 @@ then : printf "%s\n" "AUTO_SWAP=$with_autoSwap" >&6; } printf "%s\n" "#define AUTO_SWAP \"$with_autoSwap\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AUTO_SWAP=$withval" >&5 printf "%s\n" "AUTO_SWAP=$withval" >&6; } AUTO_SWAP="$withval" printf "%s\n" "#define AUTO_SWAP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3778,14 +3722,13 @@ then : printf "%s\n" "EXPORT_MODULE=$with_exportedModuleCmd" >&6; } printf "%s\n" "#define EXPORT_MODULE \"$with_exportedModuleCmd\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXPORT_MODULE=$withval" >&5 printf "%s\n" "EXPORT_MODULE=$withval" >&6; } EXPORT_MODULE="$withval" printf "%s\n" "#define EXPORT_MODULE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3800,14 +3743,13 @@ then : printf "%s\n" "REDIRECT=$with_redirect" >&6; } printf "%s\n" "#define REDIRECT \"$with_redirect\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: REDIRECT=$withval" >&5 printf "%s\n" "REDIRECT=$withval" >&6; } REDIRECT="$withval" printf "%s\n" "#define REDIRECT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3819,14 +3761,13 @@ then : printf "%s\n" "MODULEPATH_ROOT=$with_module_root_path" >&6; } printf "%s\n" "#define MODULEPATH_ROOT \"$with_module_root_path\"" >>confdefs.h -else case e in #( - e) withval="$prefix/modulefiles" +else $as_nop + withval="$prefix/modulefiles" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_ROOT=$withval" >&5 printf "%s\n" "MODULEPATH_ROOT=$withval" >&6; } MODULEPATH_ROOT="$withval" printf "%s\n" "#define MODULEPATH_ROOT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3839,14 +3780,13 @@ then : printf "%s\n" "ANCIENT=$with_ancient" >&6; } printf "%s\n" "#define ANCIENT \"$with_ancient\"" >>confdefs.h -else case e in #( - e) withval="86400" +else $as_nop + withval="86400" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ANCIENT=$withval" >&5 printf "%s\n" "ANCIENT=$withval" >&6; } ANCIENT="$withval" printf "%s\n" "#define ANCIENT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3859,14 +3799,13 @@ then : printf "%s\n" "SHORT_TIME=$with_shortTime" >&6; } printf "%s\n" "#define SHORT_TIME \"$with_shortTime\"" >>confdefs.h -else case e in #( - e) withval="2" +else $as_nop + withval="2" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SHORT_TIME=$withval" >&5 printf "%s\n" "SHORT_TIME=$withval" >&6; } SHORT_TIME="$withval" printf "%s\n" "#define SHORT_TIME \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3879,14 +3818,13 @@ then : printf "%s\n" "SPIDER_CACHE_DIRS=$with_spiderCacheDir" >&6; } printf "%s\n" "#define SPIDER_CACHE_DIRS \"$with_spiderCacheDir\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DIRS=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DIRS=$withval" >&6; } SPIDER_CACHE_DIRS="$withval" printf "%s\n" "#define SPIDER_CACHE_DIRS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3899,14 +3837,13 @@ then : printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$with_spiderCacheDescript" >&6; } printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$with_spiderCacheDescript\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SPIDER_CACHE_DESCRIPT_FN=$withval" >&5 printf "%s\n" "SPIDER_CACHE_DESCRIPT_FN=$withval" >&6; } SPIDER_CACHE_DESCRIPT_FN="$withval" printf "%s\n" "#define SPIDER_CACHE_DESCRIPT_FN \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3919,14 +3856,13 @@ then : printf "%s\n" "UPDATE_SYSTEM_FN=$with_updateSystemFn" >&6; } printf "%s\n" "#define UPDATE_SYSTEM_FN \"$with_updateSystemFn\"" >>confdefs.h -else case e in #( - e) withval="" +else $as_nop + withval="" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: UPDATE_SYSTEM_FN=$withval" >&5 printf "%s\n" "UPDATE_SYSTEM_FN=$withval" >&6; } UPDATE_SYSTEM_FN="$withval" printf "%s\n" "#define UPDATE_SYSTEM_FN \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3939,14 +3875,13 @@ then : printf "%s\n" "PREPEND_BLOCK=$with_prependBlock" >&6; } printf "%s\n" "#define PREPEND_BLOCK \"$with_prependBlock\"" >>confdefs.h -else case e in #( - e) withval="normal" +else $as_nop + withval="normal" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PREPEND_BLOCK=$withval" >&5 printf "%s\n" "PREPEND_BLOCK=$withval" >&6; } PREPEND_BLOCK="$withval" printf "%s\n" "#define PREPEND_BLOCK \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3959,14 +3894,13 @@ then : printf "%s\n" "SITE_NAME=$with_siteName" >&6; } printf "%s\n" "#define SITE_NAME \"$with_siteName\"" >>confdefs.h -else case e in #( - e) withval='' +else $as_nop + withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_NAME=$withval" >&5 printf "%s\n" "SITE_NAME=$withval" >&6; } SITE_NAME="$withval" printf "%s\n" "#define SITE_NAME \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -3979,14 +3913,13 @@ then : printf "%s\n" "SYSHOST=$with_syshost" >&6; } printf "%s\n" "#define SYSHOST \"$with_syshost\"" >>confdefs.h -else case e in #( - e) withval='' +else $as_nop + withval='' { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SYSHOST=$withval" >&5 printf "%s\n" "SYSHOST=$withval" >&6; } SYSHOST="$withval" printf "%s\n" "#define SYSHOST \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4001,14 +3934,13 @@ then : printf "%s\n" "ALLOW_TCL_MFILES==$withval" >&6; } printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ALLOW_TCL_MFILES=$withval" >&5 printf "%s\n" "ALLOW_TCL_MFILES=$withval" >&6; } ALLOW_TCL_MFILES="$withval" printf "%s\n" "#define ALLOW_TCL_MFILES \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4023,14 +3955,13 @@ then : printf "%s\n" "DISABLE_NAME_AUTOSWAP==$withval" >&6; } printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DISABLE_NAME_AUTOSWAP=$withval" >&5 printf "%s\n" "DISABLE_NAME_AUTOSWAP=$withval" >&6; } DISABLE_NAME_AUTOSWAP="$withval" printf "%s\n" "#define DISABLE_NAME_AUTOSWAP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4045,14 +3976,13 @@ then : printf "%s\n" "MPATH_AVAIL==$withval" >&6; } printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MPATH_AVAIL=$withval" >&5 printf "%s\n" "MPATH_AVAIL=$withval" >&6; } MPATH_AVAIL="$withval" printf "%s\n" "#define MPATH_AVAIL \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4067,14 +3997,13 @@ then : printf "%s\n" "SETTARG=$with_settarg" >&6; } printf "%s\n" "#define SETTARG \"$with_settarg\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SETTARG=$withval" >&5 printf "%s\n" "SETTARG=$withval" >&6; } SETTARG="$withval" printf "%s\n" "#define SETTARG \"$withval\"" >>confdefs.h - ;; -esac + fi DFLT_IGNORE_DIRS=".svn,.git,.hg,.bzr" @@ -4089,14 +4018,13 @@ then : printf "%s\n" "IGNORE_DIRS=$with_ignoreDirs" >&6; } printf "%s\n" "#define IGNORE_DIRS \"$with_ignoreDirs\"" >>confdefs.h -else case e in #( - e) withval="$DFLT_IGNORE_DIRS" +else $as_nop + withval="$DFLT_IGNORE_DIRS" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IGNORE_DIRS=$withval" >&5 printf "%s\n" "IGNORE_DIRS=$withval" >&6; } IGNORE_DIRS="$withval" printf "%s\n" "#define IGNORE_DIRS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4111,14 +4039,13 @@ then : printf "%s\n" "PIN_VERSIONS=$with_pinVersions" >&6; } printf "%s\n" "#define PIN_VERSIONS \"$with_pinVersions\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PIN_VERSIONS=$withval" >&5 printf "%s\n" "PIN_VERSIONS=$withval" >&6; } PIN_VERSIONS="$withval" printf "%s\n" "#define PIN_VERSIONS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4133,14 +4060,13 @@ then : printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$with_downstreamConflicts" >&6; } printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$with_downstreamConflicts\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LMOD_DOWNSTREAM_CONFLICTS=$withval" >&5 printf "%s\n" "LMOD_DOWNSTREAM_CONFLICTS=$withval" >&6; } LMOD_DOWNSTREAM_CONFLICTS="$withval" printf "%s\n" "#define LMOD_DOWNSTREAM_CONFLICTS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4155,14 +4081,13 @@ then : printf "%s\n" "MODULES_AUTO_HANDLING=$with_modulesAutoHandling" >&6; } printf "%s\n" "#define MODULES_AUTO_HANDLING \"$with_modulesAutoHandling\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULES_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULES_AUTO_HANDLING=$withval" >&6; } MODULES_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULES_AUTO_HANDLING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4177,14 +4102,13 @@ then : printf "%s\n" "TMOD_PATH_RULE=$with_tmodPathRule" >&6; } printf "%s\n" "#define TMOD_PATH_RULE \"$with_tmodPathRule\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_PATH_RULE=$withval" >&5 printf "%s\n" "TMOD_PATH_RULE=$withval" >&6; } TMOD_PATH_RULE="$withval" printf "%s\n" "#define TMOD_PATH_RULE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4199,14 +4123,13 @@ then : printf "%s\n" "TMOD_FIND_FIRST=$with_tmodFindFirst" >&6; } printf "%s\n" "#define TMOD_FIND_FIRST \"$with_tmodFindFirst\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: TMOD_FIND_FIRST=$withval" >&5 printf "%s\n" "TMOD_FIND_FIRST=$withval" >&6; } TMOD_FIND_FIRST="$withval" printf "%s\n" "#define TMOD_FIND_FIRST \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4219,14 +4142,13 @@ then : printf "%s\n" "LUA_INCLUDE=$with_lua_include" >&6; } printf "%s\n" "#define LUA_INCLUDE \"$with_lua_include\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_INCLUDE=$withval" >&5 printf "%s\n" "LUA_INCLUDE=$withval" >&6; } LUA_INCLUDE="$withval" printf "%s\n" "#define LUA_INCLUDE \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4241,14 +4163,13 @@ then : printf "%s\n" "CACHED_LOADS=$with_cachedLoads" >&6; } printf "%s\n" "#define CACHED_LOADS \"$with_cachedLoads\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: CACHED_LOADS=$withval" >&5 printf "%s\n" "CACHED_LOADS=$withval" >&6; } CACHED_LOADS="$withval" printf "%s\n" "#define CACHED_LOADS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4263,14 +4184,13 @@ then : printf "%s\n" "EXTENDED_DEFAULT=$with_extendedDefault" >&6; } printf "%s\n" "#define EXTENDED_DEFAULT \"$with_extendedDefault\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: EXTENDED_DEFAULT=$withval" >&5 printf "%s\n" "EXTENDED_DEFAULT=$withval" >&6; } EXTENDED_DEFAULT="$withval" printf "%s\n" "#define EXTENDED_DEFAULT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4285,14 +4205,13 @@ then : printf "%s\n" "SUPPORT_KSH=$with_supportKsh" >&6; } printf "%s\n" "#define SUPPORT_KSH \"$with_supportKsh\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SUPPORT_KSH=$withval" >&5 printf "%s\n" "SUPPORT_KSH=$withval" >&6; } SUPPORT_KSH="$withval" printf "%s\n" "#define SUPPORT_KSH \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4305,14 +4224,13 @@ then : printf "%s\n" "MODULEPATH_INIT=$with_ModulePathInit" >&6; } printf "%s\n" "#define MODULEPATH_INIT \"$with_ModulePathInit\"" >>confdefs.h -else case e in #( - e) withval="@PKG@/init/.modulespath" +else $as_nop + withval="@PKG@/init/.modulespath" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULEPATH_INIT=$withval" >&5 printf "%s\n" "MODULEPATH_INIT=$withval" >&6; } MODULEPATH_INIT="$withval" printf "%s\n" "#define MODULEPATH_INIT \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4327,14 +4245,13 @@ then : printf "%s\n" "SITE_CONTROLLED_PREFIX=$with_siteControlPrefix" >&6; } printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$with_siteControlPrefix\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SITE_CONTROLLED_PREFIX=$withval" >&5 printf "%s\n" "SITE_CONTROLLED_PREFIX=$withval" >&6; } SITE_CONTROLLED_PREFIX="$withval" printf "%s\n" "#define SITE_CONTROLLED_PREFIX \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4349,14 +4266,13 @@ then : printf "%s\n" "USE_BUILT_IN_PKGS=$with_useBuiltinPkgs" >&6; } printf "%s\n" "#define USE_BUILT_IN_PKGS \"$with_useBuiltinPkgs\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_BUILT_IN_PKGS=$withval" >&5 printf "%s\n" "USE_BUILT_IN_PKGS=$withval" >&6; } USE_BUILT_IN_PKGS="$withval" printf "%s\n" "#define USE_BUILT_IN_PKGS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4371,14 +4287,13 @@ then : printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$with_useDotConfigDirOnly" >&6; } printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$with_useDotConfigDirOnly\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USE_DOT_CONFIG_DIR_ONLY=$withval" >&5 printf "%s\n" "USE_DOT_CONFIG_DIR_ONLY=$withval" >&6; } USE_DOT_CONFIG_DIR_ONLY="$withval" printf "%s\n" "#define USE_DOT_CONFIG_DIR_ONLY \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4393,14 +4308,13 @@ then : printf "%s\n" "SILENCE_SHELL_DEBUGGING=$with_silentShellDebugging" >&6; } printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$with_silentShellDebugging\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SILENCE_SHELL_DEBUGGING=$withval" >&5 printf "%s\n" "SILENCE_SHELL_DEBUGGING=$withval" >&6; } SILENCE_SHELL_DEBUGGING="$withval" printf "%s\n" "#define SILENCE_SHELL_DEBUGGING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4415,14 +4329,13 @@ then : printf "%s\n" "FAST_TCL_INTERP=$with_fastTCLInterp" >&6; } printf "%s\n" "#define FAST_TCL_INTERP \"$with_fastTCLInterp\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FAST_TCL_INTERP=$withval" >&5 printf "%s\n" "FAST_TCL_INTERP=$withval" >&6; } FAST_TCL_INTERP="$withval" printf "%s\n" "#define FAST_TCL_INTERP \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4437,14 +4350,13 @@ then : printf "%s\n" "MODULE_AUTO_HANDLING=$with-moduleAutoHandling" >&6; } printf "%s\n" "#define MODULE_AUTO_HANDLING \"$with-moduleAutoHandling\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MODULE_AUTO_HANDLING=$withval" >&5 printf "%s\n" "MODULE_AUTO_HANDLING=$withval" >&6; } MODULE_AUTO_HANDLING="$withval" printf "%s\n" "#define MODULE_AUTO_HANDLING \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4459,14 +4371,13 @@ then : printf "%s\n" "AVAIL_EXTENSIONS=$with_availExtensions" >&6; } printf "%s\n" "#define AVAIL_EXTENSIONS \"$with_availExtensions\"" >>confdefs.h -else case e in #( - e) withval="yes" +else $as_nop + withval="yes" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: AVAIL_EXTENSIONS=$withval" >&5 printf "%s\n" "AVAIL_EXTENSIONS=$withval" >&6; } AVAIL_EXTENSIONS="$withval" printf "%s\n" "#define AVAIL_EXTENSIONS \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4484,14 +4395,13 @@ then : printf "%s\n" "PATH_TO_LUA=$with_lua" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$with_lua\"" >>confdefs.h -else case e in #( - e) withval="lua" +else $as_nop + withval="lua" PATH_TO_LUA="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$withval" >&5 printf "%s\n" "PATH_TO_LUA=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUA \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4509,14 +4419,13 @@ then : printf "%s\n" "PATH_TO_LUAC=$with_luac" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$with_luac\"" >>confdefs.h -else case e in #( - e) withval="luac" +else $as_nop + withval="luac" PATH_TO_LUAC="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$withval" >&5 printf "%s\n" "PATH_TO_LUAC=$withval" >&6; } printf "%s\n" "#define PATH_TO_LUAC \"$withval\"" >>confdefs.h - ;; -esac + fi @@ -4531,14 +4440,13 @@ then : printf "%s\n" "LUA_SUFFIX=$with_luaSuffic" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$with_luaSuffix\"" >>confdefs.h -else case e in #( - e) withval="no" +else $as_nop + withval="no" LUA_SUFFIX="$withval" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LUA_SUFFIX=$withval" >&5 printf "%s\n" "LUA_SUFFIX=$withval" >&6; } printf "%s\n" "#define LUA_SUFFIX \"$withval\"" >>confdefs.h - ;; -esac + fi if test "$ALLOW_TCL_MFILES" = no ; then @@ -4552,7 +4460,7 @@ if test "$FAST_TCL_INTERP" = yes ; then TCL_INCLUDE="-I${DIR}/usr/include" else for i in "" tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do - if test -f /usr/include/$i/tcl.hh ; then + if test -f /usr/include/$i/tcl.h ; then TCL_INCLUDE="-I/usr/include/$i" break; fi @@ -4560,15 +4468,15 @@ if test "$FAST_TCL_INTERP" = yes ; then fi if test -z "$TCL_INCLUDE" ; then - # Extract the first word of "pkg-configFoo", so it can be a program name with args. -set dummy pkg-configFoo; ac_word=$2 + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $pkgConfig in +else $as_nop + case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -4594,7 +4502,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; -esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -4673,21 +4580,15 @@ printf %s "checking for library containing Tcl_CreateInterp... " >&6; } if test ${ac_cv_search_Tcl_CreateInterp+y} then : printf %s "(cached) " >&6 -else case e in #( - e) ac_func_search_save_LIBS=$LIBS +else $as_nop + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. - The 'extern "C"' is for builds by C++ compilers; - although this is not generally supported in C code supporting it here - has little cost and some practical benefit (sr 110532). */ -#ifdef __cplusplus -extern "C" -#endif -char Tcl_CreateInterp (void); + builtin and then its argument prototype would still apply. */ +char Tcl_CreateInterp (); int main (void) { @@ -4718,13 +4619,11 @@ done if test ${ac_cv_search_Tcl_CreateInterp+y} then : -else case e in #( - e) ac_cv_search_Tcl_CreateInterp=no ;; -esac +else $as_nop + ac_cv_search_Tcl_CreateInterp=no fi rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS ;; -esac +LIBS=$ac_func_search_save_LIBS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_Tcl_CreateInterp" >&5 printf "%s\n" "$ac_cv_search_Tcl_CreateInterp" >&6; } @@ -4733,9 +4632,8 @@ if test "$ac_res" != no then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else case e in #( - e) rm -f makefile; as_fn_error $? "Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" "$LINENO" 5 ;; -esac +else $as_nop + rm -f makefile; as_fn_error $? "Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library" "$LINENO" 5 fi @@ -4792,8 +4690,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PS+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PS in +else $as_nop + case $PS in [\\/]* | ?:[\\/]*) ac_cv_path_PS="$PS" # Let the user override the test with a path. ;; @@ -4819,7 +4717,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PS" && ac_cv_path_PS="UNKNOWN_PS" ;; -esac ;; esac fi PS=$ac_cv_path_PS @@ -4847,8 +4744,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_READLINK+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $READLINK in +else $as_nop + case $READLINK in [\\/]* | ?:[\\/]*) ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path. ;; @@ -4874,7 +4771,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_READLINK" && ac_cv_path_READLINK="UNKNOWN_READLINK" ;; -esac ;; esac fi READLINK=$ac_cv_path_READLINK @@ -4904,8 +4800,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_EXPR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $EXPR in +else $as_nop + case $EXPR in [\\/]* | ?:[\\/]*) ac_cv_path_EXPR="$EXPR" # Let the user override the test with a path. ;; @@ -4930,7 +4826,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi EXPR=$ac_cv_path_EXPR @@ -4964,8 +4859,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BASENAME+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $BASENAME in +else $as_nop + case $BASENAME in [\\/]* | ?:[\\/]*) ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path. ;; @@ -4990,7 +4885,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi BASENAME=$ac_cv_path_BASENAME @@ -5024,8 +4918,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_BC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $BC in +else $as_nop + case $BC in [\\/]* | ?:[\\/]*) ac_cv_path_BC="$BC" # Let the user override the test with a path. ;; @@ -5050,7 +4944,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi BC=$ac_cv_path_BC @@ -5082,8 +4975,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_POD2MAN+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_POD2MAN in +else $as_nop + case $PATH_TO_POD2MAN in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_POD2MAN="$PATH_TO_POD2MAN" # Let the user override the test with a path. ;; @@ -5109,7 +5002,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_POD2MAN" && ac_cv_path_PATH_TO_POD2MAN="UNKNOWN_POD2MAN" ;; -esac ;; esac fi PATH_TO_POD2MAN=$ac_cv_path_PATH_TO_POD2MAN @@ -5130,8 +5022,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_GIT+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_GIT in +else $as_nop + case $PATH_TO_GIT in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_GIT="$PATH_TO_GIT" # Let the user override the test with a path. ;; @@ -5157,7 +5049,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_GIT" && ac_cv_path_PATH_TO_GIT="""" ;; -esac ;; esac fi PATH_TO_GIT=$ac_cv_path_PATH_TO_GIT @@ -5179,8 +5070,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_PAGER+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_PAGER in +else $as_nop + case $PATH_TO_PAGER in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_PAGER="$PATH_TO_PAGER" # Let the user override the test with a path. ;; @@ -5205,7 +5096,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_PAGER=$ac_cv_path_PATH_TO_PAGER @@ -5232,8 +5122,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_HASHSUM+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_HASHSUM in +else $as_nop + case $PATH_TO_HASHSUM in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_HASHSUM="$PATH_TO_HASHSUM" # Let the user override the test with a path. ;; @@ -5258,7 +5148,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_HASHSUM=$ac_cv_path_PATH_TO_HASHSUM @@ -5292,8 +5181,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TCLSH+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_TCLSH in +else $as_nop + case $PATH_TO_TCLSH in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TCLSH="$PATH_TO_TCLSH" # Let the user override the test with a path. ;; @@ -5319,7 +5208,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_PATH_TO_TCLSH" && ac_cv_path_PATH_TO_TCLSH="UNKNOWN_TCLSH" ;; -esac ;; esac fi PATH_TO_TCLSH=$ac_cv_path_PATH_TO_TCLSH @@ -5348,8 +5236,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_TR+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_TR in +else $as_nop + case $PATH_TO_TR in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_TR="$PATH_TO_TR" # Let the user override the test with a path. ;; @@ -5374,7 +5262,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_TR=$ac_cv_path_PATH_TO_TR @@ -5400,8 +5287,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_PATH_TO_LS+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $PATH_TO_LS in +else $as_nop + case $PATH_TO_LS in [\\/]* | ?:[\\/]*) ac_cv_path_PATH_TO_LS="$PATH_TO_LS" # Let the user override the test with a path. ;; @@ -5426,7 +5313,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi PATH_TO_LS=$ac_cv_path_PATH_TO_LS @@ -5492,8 +5378,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUA+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $FIND_PATH_TO_LUA in +else $as_nop + case $FIND_PATH_TO_LUA in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUA="$FIND_PATH_TO_LUA" # Let the user override the test with a path. ;; @@ -5518,7 +5404,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi FIND_PATH_TO_LUA=$ac_cv_path_FIND_PATH_TO_LUA @@ -5548,8 +5433,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_FIND_PATH_TO_LUAC+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $FIND_PATH_TO_LUAC in +else $as_nop + case $FIND_PATH_TO_LUAC in [\\/]* | ?:[\\/]*) ac_cv_path_FIND_PATH_TO_LUAC="$FIND_PATH_TO_LUAC" # Let the user override the test with a path. ;; @@ -5574,7 +5459,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi FIND_PATH_TO_LUAC=$ac_cv_path_FIND_PATH_TO_LUAC @@ -5721,8 +5605,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $pkgConfig in +else $as_nop + case $pkgConfig in [\\/]* | ?:[\\/]*) ac_cv_path_pkgConfig="$pkgConfig" # Let the user override the test with a path. ;; @@ -5748,7 +5632,6 @@ IFS=$as_save_IFS test -z "$ac_cv_path_pkgConfig" && ac_cv_path_pkgConfig="""" ;; -esac ;; esac fi pkgConfig=$ac_cv_path_pkgConfig @@ -5818,8 +5701,8 @@ printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_ZSH+y} then : printf %s "(cached) " >&6 -else case e in #( - e) case $ZSH in +else $as_nop + case $ZSH in [\\/]* | ?:[\\/]*) ac_cv_path_ZSH="$ZSH" # Let the user override the test with a path. ;; @@ -5844,7 +5727,6 @@ done IFS=$as_save_IFS ;; -esac ;; esac fi ZSH=$ac_cv_path_ZSH @@ -5928,8 +5810,8 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# 'ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* 'ac_cv_foo' will be assigned the +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. _ACEOF @@ -5959,14 +5841,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # 'set' does not quote correctly, so add quotes: double-quote + # `set' does not quote correctly, so add quotes: double-quote # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; #( *) - # 'set' quotes correctly as required by POSIX, so do not add quotes. + # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; esac | @@ -6030,7 +5912,9 @@ s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g t quote b any :quote -s/[][ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g s/\$/$$/g H :any @@ -6090,6 +5974,7 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh +as_nop=: if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 then : emulate sh @@ -6098,13 +5983,12 @@ then : # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else case e in #( - e) case `(set -o) 2>/dev/null` in #( +else $as_nop + case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( *) : ;; -esac ;; esac fi @@ -6176,7 +6060,7 @@ IFS=$as_save_IFS ;; esac -# We did not find ourselves, most probably we were run as 'sh COMMAND' +# We did not find ourselves, most probably we were run as `sh COMMAND' # in which case we are not to be found in the path. if test "x$as_myself" = x; then as_myself=$0 @@ -6205,6 +6089,7 @@ as_fn_error () } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -6244,12 +6129,11 @@ then : { eval $1+=\$2 }' -else case e in #( - e) as_fn_append () +else $as_nop + as_fn_append () { eval $1=\$$1\$2 - } ;; -esac + } fi # as_fn_append # as_fn_arith ARG... @@ -6263,12 +6147,11 @@ then : { as_val=$(( $* )) }' -else case e in #( - e) as_fn_arith () +else $as_nop + as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` - } ;; -esac + } fi # as_fn_arith @@ -6351,9 +6234,9 @@ if (echo >conf$$.file) 2>/dev/null; then if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' # ... but there are two gotchas: - # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable. - # In both cases, we have to default to 'cp -pR'. + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then @@ -6434,12 +6317,10 @@ as_test_x='test -x' as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. -as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -as_tr_sh="eval sed '$as_sed_sh'" # deprecated +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" exec 6>&1 @@ -6455,7 +6336,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.72. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6482,7 +6363,7 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -'$as_me' instantiates files and other configuration actions +\`$as_me' instantiates files and other configuration actions from templates according to the current configuration. Unless the files and actions are specified as TAGs, all are instantiated by default. @@ -6510,10 +6391,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.72, +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2023 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -6570,8 +6451,8 @@ do ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: '$1' -Try '$0 --help' for more information." ;; + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; @@ -6621,7 +6502,7 @@ do case $ac_config_target in "makefile") CONFIG_FILES="$CONFIG_FILES makefile:Makefile.in" ;; - *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -6639,7 +6520,7 @@ fi # creating and moving files from /tmp can sometimes cause problems. # Hook for its removal unless debugging. # Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to '$tmp'. +# after its creation but before its name has been assigned to `$tmp'. $debug || { tmp= ac_tmp= @@ -6663,7 +6544,7 @@ ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -# This happens for instance with './config.status config.h'. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then @@ -6829,7 +6710,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6851,19 +6732,19 @@ do -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain ':'. + # because $ac_f cannot contain `:'. test -f "$ac_f" || case $ac_f in [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done - # Let's still pretend it is 'configure' which instantiates (i.e., don't + # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` @@ -6987,7 +6868,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 esac _ACEOF -# Neutralize VPATH when '$srcdir' = '.'. +# Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -7016,9 +6897,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" diff --git a/configure.ac b/configure.ac index 9f93b27b9..93defccf0 100644 --- a/configure.ac +++ b/configure.ac @@ -707,7 +707,7 @@ if test "$FAST_TCL_INTERP" = yes ; then TCL_INCLUDE="-I${DIR}/usr/include" else for i in "" tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do - if test -f /usr/include/$i/tcl.hh ; then + if test -f /usr/include/$i/tcl.h ; then TCL_INCLUDE="-I/usr/include/$i" break; fi @@ -715,7 +715,7 @@ if test "$FAST_TCL_INTERP" = yes ; then fi if test -z "$TCL_INCLUDE" ; then - AC_PATH_PROG(pkgConfig, pkg-configFoo, "") + AC_PATH_PROG(pkgConfig, pkg-config, "") if ! test x$pkgConfig = "x"; then for i in tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do $pkgConfig --exists $i diff --git a/init/bash.in b/init/bash.in index 2c82ea8bb..fb5065841 100644 --- a/init/bash.in +++ b/init/bash.in @@ -25,8 +25,8 @@ fi __build_FPATH_for_zsh_ksh() { - zsh_fpath=$(zsh -f -c 'echo $FPATH') - export FPATH=$(@PKGV@/libexec/addto --append FPATH $zsh_fpath @PKGV@/init/ksh_funcs) + zsh_fpath=$(unset FPATH; zsh -f -c 'echo $FPATH') + export FPATH=$(@PKGV@/libexec/addto --append FPATH ${zsh_fpath} @PKGV@/init/ksh_funcs) unset zsh_fpath } From 4850986bd87cc9451cea17d6d94e0b81a3975232 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 1 Aug 2024 09:48:53 -0500 Subject: [PATCH 054/198] fix pkg-config in configure.ac --- configure | 41 +++++++++++++++++++++++++++++++++-------- configure.ac | 40 ++++++++++++++++++++++++++++++++-------- 2 files changed, 65 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 4adc9c2ca..8872ef2ff 100755 --- a/configure +++ b/configure @@ -3460,6 +3460,8 @@ FOLLOW_READLINK () echo $myprog } +ERR_MSG="" +FOUND_ERROR= @@ -4385,7 +4387,8 @@ if test ${with_lua+y} then : withval=$with_lua; PATH_TO_LUA="$withval" if test ${PATH_TO_LUA:0:1} != '/' ; then - echo "Path to lua must be absolute" + echo + echo "ERROR: Path to lua must be absolute!" exit 1 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUA=$with_lua" >&5 @@ -4408,7 +4411,8 @@ if test ${with_luac+y} then : withval=$with_luac; PATH_TO_LUAC="$withval" if test ${PATH_TO_LUAC:0:1} != '/' ; then - echo "Path to luac must be absolute" + echo + echo "ERROR: Path to luac must be absolute" exit 1 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: PATH_TO_LUAC=$with_luac" >&5 @@ -4565,7 +4569,11 @@ fi if test "$ac_cv_header_tcl_h" != yes ; then rm -f makefile - as_fn_error $? "Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" "$LINENO" 5 + FOUND_ERROR=yes + MSG="Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" + ERR_MSG="$ERR_MSG||$MSG" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $MSG" >&5 +printf "%s\n" "$as_me: $MSG" >&6;} fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing Tcl_CreateInterp" >&5 printf %s "checking for library containing Tcl_CreateInterp... " >&6; } @@ -4658,14 +4666,17 @@ PATH_TO_SRC=$SRCDIR -if test $MODE != "user_default" ; then - mode=0$MODE +if test $MODE == "user_default" ; then + mode=0755 EXEC_BITS=$(( 0111 & $mode )); if test $EXEC_BITS = 0; then +MSG="MODE must have at least one executable bit set (Not MODE=$MODE) +Please try setting mode to 755 or 750 or 700 or similar." + + echo "$MSG" echo - echo "MODE must have at least one executable bit set (Not MODE=$MODE)" - echo "Please try setting mode to 755 or 750 or 700 or similar." - echo +ERR_MSG="$ERR_MSG +$MSG" rm -f makefile exit 1 fi @@ -5667,6 +5678,20 @@ fi ##### LUA configuration -- end +if test "$FOUND_ERROR" = yes; then + echo + echo One or more errors found: + echo + echo Error Messages: + echo "------------------------------------------------------------" + echo $ERR_MSG | tr '|' '\n' | while read item; do + echo $item + done + echo "------------------------------------------------------------" + + rm -f makefile + exit 1; +fi # Extract the first word of "zsh", so it can be a program name with args. diff --git a/configure.ac b/configure.ac index e55bf3682..93defccf0 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,8 @@ FOLLOW_READLINK () echo $myprog } +ERR_MSG="" +FOUND_ERROR= AC_SUBST(DUPLICATE_PATHS) AC_ARG_WITH(duplicatePaths, @@ -651,7 +653,8 @@ AC_ARG_WITH(lua, AS_HELP_STRING([--with-lua=ans],[absolute path to the lua interpreter to use [[lua]]]), PATH_TO_LUA="$withval" if test ${PATH_TO_LUA:0:1} != '/' ; then - echo "Path to lua must be absolute" + echo + echo "ERROR: Path to lua must be absolute!" exit 1 fi AC_MSG_RESULT([PATH_TO_LUA=$with_lua]) @@ -667,7 +670,8 @@ AC_ARG_WITH(luac, AS_HELP_STRING([--with-luac=ans],[absolute path to the luac interpreter to use [[luac]]]), PATH_TO_LUAC="$withval" if test ${PATH_TO_LUAC:0:1} != '/' ; then - echo "Path to luac must be absolute" + echo + echo "ERROR: Path to luac must be absolute" exit 1 fi AC_MSG_RESULT([PATH_TO_LUAC=$with_luac]) @@ -731,7 +735,10 @@ if test "$FAST_TCL_INTERP" = yes ; then if test "$ac_cv_header_tcl_h" != yes ; then rm -f makefile - AC_MSG_ERROR([Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h]) + FOUND_ERROR=yes + MSG="Unable to build Lmod without tcl.h. Please install the tcl devel package or configure --with-fastTCLInterp=no to not require tcl.h" + ERR_MSG="$ERR_MSG||$MSG" + AC_MSG_NOTICE([$MSG]) fi AC_SEARCH_LIBS(Tcl_CreateInterp, [tcl] [tcl8.8] [tcl8.7] [tcl8.6] [tcl8.5],[], [rm -f makefile; AC_MSG_ERROR([Unable to build Lmod with -ltcl Please install the tcl devel package or configure --with-fastTCLInterp=no to not require the tcl library])], [$TCL_LIBS]) @@ -763,14 +770,17 @@ AC_SUBST(PATH_TO_HASHSUM) AC_SUBST(PATH_TO_PAGER) AC_SUBST(PATH_TO_TCLSH) -if test $MODE != "user_default" ; then - mode=0$MODE +if test $MODE == "user_default" ; then + mode=0755 EXEC_BITS=$(( 0111 & $mode )); if test $EXEC_BITS = 0; then +MSG="MODE must have at least one executable bit set (Not MODE=$MODE) +Please try setting mode to 755 or 750 or 700 or similar." + + echo "$MSG" echo - echo "MODE must have at least one executable bit set (Not MODE=$MODE)" - echo "Please try setting mode to 755 or 750 or 700 or similar." - echo +ERR_MSG="$ERR_MSG +$MSG" rm -f makefile exit 1 fi @@ -1060,6 +1070,20 @@ fi ##### LUA configuration -- end +if test "$FOUND_ERROR" = yes; then + echo + echo One or more errors found: + echo + echo Error Messages: + echo "------------------------------------------------------------" + echo $ERR_MSG | tr '|' '\n' | while read item; do + echo $item + done + echo "------------------------------------------------------------" + + rm -f makefile + exit 1; +fi AC_SUBST(ZSH_SITE_FUNCTIONS_DIRS) AC_PATH_PROG(ZSH, zsh) From c6f04e516df2574ddf110e01a128a8fba34d5aa5 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 1 Aug 2024 09:49:10 -0500 Subject: [PATCH 055/198] fix pkg-config in configure.ac --- configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 3168704f3..8872ef2ff 100755 --- a/configure +++ b/configure @@ -4468,8 +4468,8 @@ if test "$FAST_TCL_INTERP" = yes ; then fi if test -z "$TCL_INCLUDE" ; then - # Extract the first word of "pkg-configFoo", so it can be a program name with args. -set dummy pkg-configFoo; ac_word=$2 + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} diff --git a/configure.ac b/configure.ac index 94dc31766..93defccf0 100644 --- a/configure.ac +++ b/configure.ac @@ -715,7 +715,7 @@ if test "$FAST_TCL_INTERP" = yes ; then fi if test -z "$TCL_INCLUDE" ; then - AC_PATH_PROG(pkgConfig, pkg-configFoo, "") + AC_PATH_PROG(pkgConfig, pkg-config, "") if ! test x$pkgConfig = "x"; then for i in tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do $pkgConfig --exists $i From 6ab74d9289b174d83aaba7441a83e63f0073aae9 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 1 Aug 2024 09:49:35 -0500 Subject: [PATCH 056/198] fix pkg-config in configure.ac --- configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 3168704f3..8872ef2ff 100755 --- a/configure +++ b/configure @@ -4468,8 +4468,8 @@ if test "$FAST_TCL_INTERP" = yes ; then fi if test -z "$TCL_INCLUDE" ; then - # Extract the first word of "pkg-configFoo", so it can be a program name with args. -set dummy pkg-configFoo; ac_word=$2 + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } if test ${ac_cv_path_pkgConfig+y} diff --git a/configure.ac b/configure.ac index 94dc31766..93defccf0 100644 --- a/configure.ac +++ b/configure.ac @@ -715,7 +715,7 @@ if test "$FAST_TCL_INTERP" = yes ; then fi if test -z "$TCL_INCLUDE" ; then - AC_PATH_PROG(pkgConfig, pkg-configFoo, "") + AC_PATH_PROG(pkgConfig, pkg-config, "") if ! test x$pkgConfig = "x"; then for i in tcl tcl8.8 tcl8.7 tcl8.6 tcl8.5; do $pkgConfig --exists $i From 9388c2ef6960d456c1c13e00d6c3a2d3c069d54b Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 1 Aug 2024 09:53:29 -0500 Subject: [PATCH 057/198] unset FPATH before asking for a new value --- init/bash.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/bash.in b/init/bash.in index 2c82ea8bb..bede85e79 100644 --- a/init/bash.in +++ b/init/bash.in @@ -25,7 +25,7 @@ fi __build_FPATH_for_zsh_ksh() { - zsh_fpath=$(zsh -f -c 'echo $FPATH') + zsh_fpath=$(unset FPATH; zsh -f -c 'echo $FPATH') export FPATH=$(@PKGV@/libexec/addto --append FPATH $zsh_fpath @PKGV@/init/ksh_funcs) unset zsh_fpath } From d94c5deee0c35a14374337d5724f0a0b818ed4f8 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 1 Aug 2024 21:01:02 -0500 Subject: [PATCH 058/198] Merging in IS667-terse-av-ext branch on to the testing branch --- README.new | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.new b/README.new index afa635530..210b3150c 100644 --- a/README.new +++ b/README.new @@ -166,3 +166,5 @@ W.I.P: (8.7.48) * Issue #717: Keep previous varT when restoring a collection. Otherwise the previous modules env vars. are lost and therefore not purged. * Issue #718: use __build_FPATH_for_zsh_ksh to build FPATH for both shells + * Issue #667: support for terse avail extensions + From 1bf0116e3551f6ea337de61c39bc85f656249c93 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Mon, 5 Aug 2024 12:52:09 -0600 Subject: [PATCH 059/198] Adding docs for module purge and moudle --force purge --- docs/source/010_user.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/source/010_user.rst b/docs/source/010_user.rst index e0d70c9bb..ac184ddb7 100644 --- a/docs/source/010_user.rst +++ b/docs/source/010_user.rst @@ -36,6 +36,18 @@ The above command is short for:: $ module unload gcc $ module load intel +To remove all modules do:: + + $ module purge + +This will remove all modules. Lmod will try to reload any sticky +modules. + +To remove all modules including sticky modules do:: + + $ module --force purge + + A user may wish to go back to an initial set of modules:: $ module reset From d274f9f47b094dcefc6578996196be7309ac5715 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Wed, 7 Aug 2024 14:05:57 -0600 Subject: [PATCH 060/198] adding arch.py to contrib/TACC --- contrib/TACC/arch.py | 74 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100755 contrib/TACC/arch.py diff --git a/contrib/TACC/arch.py b/contrib/TACC/arch.py new file mode 100755 index 000000000..635b72b8f --- /dev/null +++ b/contrib/TACC/arch.py @@ -0,0 +1,74 @@ +#!/bin/sh +# -*- python -*- + +################################################################################ +# This file is python bilingual: The next line starts a comment in Python, +# and is a no-op in shell +""":" +# Find a suitable python interpreter (adapt for your specific needs) +for cmd in python3 python python2; do + command -v > /dev/null $cmd && exec $cmd $0 "$@" +done + +echo "Error: Could not find a valid python interpreter --> exiting!" >&2 +exit 2 +":""" +################################################################################ + +# This program reports the (uname -m) and cpu family and the model from /proc/cpuinfo +# On chips that support AVX2 the model is replaced with "avx2". + +# Robert McLay 2016-08-11 12:33 + + + +from __future__ import print_function +import os, sys, re, platform + +def main(): + osName = platform.system() + machName = platform.machine() + machDescript = "" + cpuFamily = False + model = False + + if (osName == "Linux" and machName == "x86_64"): + f = open("/proc/cpuinfo","r") + + count = 0 + avx2 = False + for line in f: + if (line.find("cpu family") != -1): + A = re.findall(r'\d+',line) + cpuFamily = "%02x" %( int(A[0]) ) + count += 1 + elif (line.find("model name") != -1): + A = re.findall(r'.*: *(.*)',line) + machDescript = A[0] + count += 1 + elif (line.find("model") != -1): + A = re.findall(r'.*: *(.*)',line) + model = "%02x" % ( int(A[0]) ) + count += 1 + elif (line.find("flags") != -1): + A = re.findall(r'.*: *(.*)',line) + flagStr = A[0] + if (flagStr.find("avx2") != -1): + model = "avx2" + count += 1 + if (count > 3): + break + + f.close() + A = [] + A.append(machName) + if (cpuFamily): + A.append(cpuFamily) + if (model): + A.append(model) + + machName = "_".join(A) + print(machName) + + +if ( __name__ == '__main__'): main() From 7eeca72c67ff2711c7221350eeeac606cfe3902e Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 8 Aug 2024 11:06:27 -0600 Subject: [PATCH 061/198] add string test to convertToCanonical() --- docs/source/010_user.rst | 1 - src/modfuncs.lua | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/010_user.rst b/docs/source/010_user.rst index ac184ddb7..501b84eca 100644 --- a/docs/source/010_user.rst +++ b/docs/source/010_user.rst @@ -47,7 +47,6 @@ To remove all modules including sticky modules do:: $ module --force purge - A user may wish to go back to an initial set of modules:: $ module reset diff --git a/src/modfuncs.lua b/src/modfuncs.lua index db98af37b..d37d8c063 100644 --- a/src/modfuncs.lua +++ b/src/modfuncs.lua @@ -527,6 +527,7 @@ userInGroup = userInGroups -------------------------------------------------------------------------- -- Convert version to canonical so that it can be used in a comparison. function convertToCanonical(s) + if (not l_validateStringArgs("convertToCanonical",s)) then return end return parseVersion(s) end From 1fb59eca2108bae2e07ca66c44636803c7da7d84 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 8 Aug 2024 11:10:33 -0600 Subject: [PATCH 062/198] switch M.getHiddenT() to a local function -> l_getHiddenT() --- src/MRC.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MRC.lua b/src/MRC.lua index d3f1fdd96..0a846c113 100644 --- a/src/MRC.lua +++ b/src/MRC.lua @@ -429,7 +429,7 @@ function M.export(self) end local s_must_convert = true -function M.getHiddenT(self, mpathA, k) +local function l_getHiddenT(self, mpathA, k) local t = {} if (s_must_convert) then s_must_convert = false @@ -494,7 +494,7 @@ function M.isVisible(self, modT) local fn = modT.fn local isVisible = true - if (self:getHiddenT(mpathA, name) or self:getHiddenT(mpathA, fn)) then + if (l_getHiddenT(self, mpathA, name) or l_getHiddenT(self, mpathA, fn)) then isVisible = false elseif (name:sub(1,1) == ".") then isVisible = false From 499569a7aaa68e08c15918584b3bd63f5b6d7b5d Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 8 Aug 2024 13:20:47 -0500 Subject: [PATCH 063/198] Make CollectModuleData4Web.sh use system Lmod not ~mclay or ~swtools --- contrib/TACC/CollectModuleData4Web.sh | 72 ++++++++------------------- 1 file changed, 20 insertions(+), 52 deletions(-) diff --git a/contrib/TACC/CollectModuleData4Web.sh b/contrib/TACC/CollectModuleData4Web.sh index 7cec7c049..fcf619e73 100755 --- a/contrib/TACC/CollectModuleData4Web.sh +++ b/contrib/TACC/CollectModuleData4Web.sh @@ -4,64 +4,32 @@ ###################################################################### # find ADMIN_DIR -cmd=$0 -dir=$(dirname $cmd); -if [ $dir = "." ]; then - dir=$PWD -fi -ADMIN_DIR=$dir +SCRIPT_NAME="${BASH_SOURCE[0]:-${(%):-%x}}" +SCRIPT_DIR=${SCRIPT_NAME%/*} -###################################################################### -# find arch.py command if it exists -export PATH=$ADMIN_DIR/bin:$PATH -if command -v arch.py > /dev/null ; then - ARCH=$(arch.py) -else - ARCH=$(arch) -fi -###################################################################### -# Use ~swtools dir if it exists otherwise use ~mclay +if [ $SCRIPT_DIR = "." ]; then + SCRIPT_DIR=$PWD +fi -###################################################################### -# Find LMOD_DIR in either ~swtools or ~mclay - - -MCLAY=~mclay -SWTOOLS=~swtools -DIRLIST=( $SWTOOLS/l/pkg/$ARCH/lmod/lmod/libexec/ - $SWTOOLS/l/pkg/lmod/lmod/libexec/ - $MCLAY/l/pkg/$ARCH/lmod/lmod/libexec/ - $MCLAY/l/pkg/lmod/lmod/libexec/ - ) - -for i in "${DIRLIST[@]}"; do - if [ -x $i/spider ]; then - LMOD_DIR=$i - break; - fi -done +######################################################################## +# find spider cmd -###################################################################### -# Find LUATOOLS in either ~swtools or ~mclay - -DIRLIST=( $SWTOOLS/l/pkg/$ARCH/luatools/luatools - $SWTOOLS/l/pkg/luatools/luatools - $MCLAY/l/pkg/$ARCH/luatools/luatools - $MCLAY/l/pkg/luatools/luatools - ) +LMOD_DIR=/opt/apps/lmod/lmod/libexec +if [ ! -x $LMOD_DIR/spider ]; then + echo "$LMOD_DIR/spider command not found!" '-> Quiting!' + exit 1 +fi + -lua_version=$(lua -e 'print((_VERSION:gsub("Lua ","")))') +######################################################################## +# Make sure that $ADMIN_DIR/softwarePage exists -for i in "${DIRLIST[@]}"; do - if [ -f $i/share/$lua_version/strict.lua ]; then - LUATOOLS=$i - break; - fi -done +ADMIN_DIR=$SCRIPT_DIR +mkdir -p $ADMIN_DIR/softwarePage -export LUA_PATH="$LUATOOLS/share/$lua_version"'/?.lua;;' -export LUA_CPATH="$LUATOOLS/lib/$lua_version"'/?.so;;' +######################################################################## +# find BASE_MODULE_PATH BASE_MODULE_PATH="" @@ -74,7 +42,7 @@ BASE_MODULE_PATH=${BASE_MODULE_PATH%:} $LMOD_DIR/spider -o softwarePage $BASE_MODULE_PATH > $ADMIN_DIR/softwarePage/softwarePage.old.json -python -mjson.tool $ADMIN_DIR/softwarePage/softwarePage.old.json > $ADMIN_DIR/softwarePage/softwarePage.json 2> /dev/null +python3 -mjson.tool $ADMIN_DIR/softwarePage/softwarePage.old.json > $ADMIN_DIR/softwarePage/softwarePage.json 2> /dev/null if [ -s $ADMIN_DIR/softwarePage/softwarePage.json ]; then rm -f $ADMIN_DIR/softwarePage/softwarePage.old.json else From 433b8a05ca54b290bb464dc1363ed95b714fdd4e Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 8 Aug 2024 12:34:44 -0600 Subject: [PATCH 064/198] update docs about convertToCanonical() and module finding --- docs/source/040_FAQ.rst | 14 ++++++++++++++ docs/source/050_lua_modulefiles.rst | 10 +++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/docs/source/040_FAQ.rst b/docs/source/040_FAQ.rst index 99db330e0..642f4c428 100644 --- a/docs/source/040_FAQ.rst +++ b/docs/source/040_FAQ.rst @@ -425,3 +425,17 @@ Why don't collections work on HPE/Cray systems? **MPI_HOME** as part of mpi program startup script, then those users would not be able to submit mpi programs. +How to compare Lmod versions inside a module file? + + Sites can use **convertToCanonical("string")** to test the Lmod version:: + + if(convertToCanonical(LmodVersion()) < convertToCanonical("8.6")) then + LmodMessage("source_sh() is not supported with this version of Lmod") + end + +Why can't Lmod find this module in $MODULEPATH? + + A modulefile written in Lua requires a .lua extension. A + modulefile without the .lua extension is assumed to be written in + TCL. However all TCL modulefiles must start with **#%Module** at + the at the very top of the file. Otherwise they are silently ignored. diff --git a/docs/source/050_lua_modulefiles.rst b/docs/source/050_lua_modulefiles.rst index 17738eaae..fcbf1c803 100644 --- a/docs/source/050_lua_modulefiles.rst +++ b/docs/source/050_lua_modulefiles.rst @@ -191,7 +191,6 @@ unset during unloading. $MODULEPATH when building the spider cache. See :ref:`spider_tool-label` for details. - Extra functions ~~~~~~~~~~~~~~~ @@ -273,6 +272,15 @@ The entries below describe several useful commands that come with Lmod that can **LmodVersion** (): The version of lmod. +**convertToCanonical** ("string"): + A modulefile can use this function to know if an Lmod feature is + supported:: + + if (convertToCanonical(LmodVersion()) < convertToCanonical("8.6") ) then + LmodMessage("The function source_sh() is not supported") + end + + **execute** {cmd="**", modeA={"load"}} Run any command with a certain mode. For example **execute** {cmd="ulimit -s unlimited",modeA={"load"}} will run From cf205ed255a1478890f39c63de63401053ca1bab Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 8 Aug 2024 12:35:51 -0600 Subject: [PATCH 065/198] update CollectWebModuleData4Web to find an executable python --- contrib/TACC/CollectModuleData4Web.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/contrib/TACC/CollectModuleData4Web.sh b/contrib/TACC/CollectModuleData4Web.sh index fcf619e73..23e9608e1 100755 --- a/contrib/TACC/CollectModuleData4Web.sh +++ b/contrib/TACC/CollectModuleData4Web.sh @@ -40,9 +40,23 @@ for i in /opt/modulefiles /opt/apps/modulefiles /opt/apps/xsede/modulefiles; do done BASE_MODULE_PATH=${BASE_MODULE_PATH%:} +######################################################################## +# find name for python3 + +PYTHON= +for cmd in python3 python python2; do + command -v $cmd > /dev/null + if [ "$?" = 0 ]; then + PYTHON=$cmd + break + fi +done + +# Build json software page and make it pretty if possible. + $LMOD_DIR/spider -o softwarePage $BASE_MODULE_PATH > $ADMIN_DIR/softwarePage/softwarePage.old.json -python3 -mjson.tool $ADMIN_DIR/softwarePage/softwarePage.old.json > $ADMIN_DIR/softwarePage/softwarePage.json 2> /dev/null +$PYTHON -mjson.tool $ADMIN_DIR/softwarePage/softwarePage.old.json > $ADMIN_DIR/softwarePage/softwarePage.json 2> /dev/null if [ -s $ADMIN_DIR/softwarePage/softwarePage.json ]; then rm -f $ADMIN_DIR/softwarePage/softwarePage.old.json else From efd893e9a2dab1300a0d6f3ea998dc3503fd8d39 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 8 Aug 2024 12:45:45 -0600 Subject: [PATCH 066/198] update CollectWebModuleData4Web to use system Lmod --- contrib/TACC/CollectModuleData4Web.sh | 90 +++++++++++---------------- 1 file changed, 36 insertions(+), 54 deletions(-) diff --git a/contrib/TACC/CollectModuleData4Web.sh b/contrib/TACC/CollectModuleData4Web.sh index 7cec7c049..23e9608e1 100755 --- a/contrib/TACC/CollectModuleData4Web.sh +++ b/contrib/TACC/CollectModuleData4Web.sh @@ -4,64 +4,32 @@ ###################################################################### # find ADMIN_DIR -cmd=$0 -dir=$(dirname $cmd); -if [ $dir = "." ]; then - dir=$PWD -fi -ADMIN_DIR=$dir +SCRIPT_NAME="${BASH_SOURCE[0]:-${(%):-%x}}" +SCRIPT_DIR=${SCRIPT_NAME%/*} -###################################################################### -# find arch.py command if it exists -export PATH=$ADMIN_DIR/bin:$PATH -if command -v arch.py > /dev/null ; then - ARCH=$(arch.py) -else - ARCH=$(arch) + +if [ $SCRIPT_DIR = "." ]; then + SCRIPT_DIR=$PWD +fi + +######################################################################## +# find spider cmd + +LMOD_DIR=/opt/apps/lmod/lmod/libexec +if [ ! -x $LMOD_DIR/spider ]; then + echo "$LMOD_DIR/spider command not found!" '-> Quiting!' + exit 1 fi + -###################################################################### -# Use ~swtools dir if it exists otherwise use ~mclay +######################################################################## +# Make sure that $ADMIN_DIR/softwarePage exists -###################################################################### -# Find LMOD_DIR in either ~swtools or ~mclay - - -MCLAY=~mclay -SWTOOLS=~swtools -DIRLIST=( $SWTOOLS/l/pkg/$ARCH/lmod/lmod/libexec/ - $SWTOOLS/l/pkg/lmod/lmod/libexec/ - $MCLAY/l/pkg/$ARCH/lmod/lmod/libexec/ - $MCLAY/l/pkg/lmod/lmod/libexec/ - ) - -for i in "${DIRLIST[@]}"; do - if [ -x $i/spider ]; then - LMOD_DIR=$i - break; - fi -done +ADMIN_DIR=$SCRIPT_DIR +mkdir -p $ADMIN_DIR/softwarePage -###################################################################### -# Find LUATOOLS in either ~swtools or ~mclay - -DIRLIST=( $SWTOOLS/l/pkg/$ARCH/luatools/luatools - $SWTOOLS/l/pkg/luatools/luatools - $MCLAY/l/pkg/$ARCH/luatools/luatools - $MCLAY/l/pkg/luatools/luatools - ) - -lua_version=$(lua -e 'print((_VERSION:gsub("Lua ","")))') - -for i in "${DIRLIST[@]}"; do - if [ -f $i/share/$lua_version/strict.lua ]; then - LUATOOLS=$i - break; - fi -done - -export LUA_PATH="$LUATOOLS/share/$lua_version"'/?.lua;;' -export LUA_CPATH="$LUATOOLS/lib/$lua_version"'/?.so;;' +######################################################################## +# find BASE_MODULE_PATH BASE_MODULE_PATH="" @@ -72,9 +40,23 @@ for i in /opt/modulefiles /opt/apps/modulefiles /opt/apps/xsede/modulefiles; do done BASE_MODULE_PATH=${BASE_MODULE_PATH%:} +######################################################################## +# find name for python3 + +PYTHON= +for cmd in python3 python python2; do + command -v $cmd > /dev/null + if [ "$?" = 0 ]; then + PYTHON=$cmd + break + fi +done + +# Build json software page and make it pretty if possible. + $LMOD_DIR/spider -o softwarePage $BASE_MODULE_PATH > $ADMIN_DIR/softwarePage/softwarePage.old.json -python -mjson.tool $ADMIN_DIR/softwarePage/softwarePage.old.json > $ADMIN_DIR/softwarePage/softwarePage.json 2> /dev/null +$PYTHON -mjson.tool $ADMIN_DIR/softwarePage/softwarePage.old.json > $ADMIN_DIR/softwarePage/softwarePage.json 2> /dev/null if [ -s $ADMIN_DIR/softwarePage/softwarePage.json ]; then rm -f $ADMIN_DIR/softwarePage/softwarePage.old.json else From fe710f4f6052a49b87ec0f60825962e692e3add0 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 8 Aug 2024 13:06:48 -0600 Subject: [PATCH 067/198] small cleanup --- contrib/TACC/CollectModuleData4Web.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/TACC/CollectModuleData4Web.sh b/contrib/TACC/CollectModuleData4Web.sh index 23e9608e1..9b37344e0 100755 --- a/contrib/TACC/CollectModuleData4Web.sh +++ b/contrib/TACC/CollectModuleData4Web.sh @@ -11,6 +11,7 @@ SCRIPT_DIR=${SCRIPT_NAME%/*} if [ $SCRIPT_DIR = "." ]; then SCRIPT_DIR=$PWD fi +ADMIN_DIR=$SCRIPT_DIR ######################################################################## # find spider cmd @@ -25,7 +26,6 @@ fi ######################################################################## # Make sure that $ADMIN_DIR/softwarePage exists -ADMIN_DIR=$SCRIPT_DIR mkdir -p $ADMIN_DIR/softwarePage ######################################################################## From 65387f15a568086290bfb864daa078993300d984 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 8 Aug 2024 21:26:18 -0600 Subject: [PATCH 068/198] fix dbg.fini() name --- src/modfuncs.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modfuncs.lua b/src/modfuncs.lua index d37d8c063..b02b856a3 100644 --- a/src/modfuncs.lua +++ b/src/modfuncs.lua @@ -590,7 +590,7 @@ function atmost(m, ie) local mname = MName:new("load", m, "atmost", false, ie) - dbg.fini("atleast") + dbg.fini("atmost") return mname end From 30614db5dfe572991a127783915dd879da035c37 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 8 Aug 2024 21:27:43 -0600 Subject: [PATCH 069/198] Moved util.lua isActiveMFile to l_isActiveMfile in spider.lua --- src/Spider.lua | 12 +++++++++--- src/utils.lua | 5 ----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Spider.lua b/src/Spider.lua index 0e2297215..9318e55d7 100644 --- a/src/Spider.lua +++ b/src/Spider.lua @@ -103,6 +103,12 @@ function processDIR(value) l_process("dirA",value) end +local function l_isActiveMfile(mrc, full, sn, fn) + local version = extractVersion(full, sn) or "" + return mrc:isVisible{fullName=full, sn=sn, fn=fn}, version +end + + local function l_processNewModulePATH(path) dbg.start{"l_processNewModulePATH(path)"} @@ -757,7 +763,7 @@ function M.Level0_terse(self,dbT, providedByT) local a = {} for sn, vv in pairs(dbT) do for fn, v in pairs(vv) do - local isActive, version = isActiveMFile(mrc, v.fullName, sn, fn) + local isActive, version = l_isActiveMfile(mrc, v.fullName, sn, fn) if (show_hidden or isActive) then if (sn == v.fullName) then t[sn] = sn @@ -833,7 +839,7 @@ function M.Level0Helper(self, dbT, providedByT, a) for sn, vv in pairs(dbT) do for fn,v in pairsByKeys(vv) do - local isActive, version = isActiveMFile(mrc, v.fullName, sn, fn) + local isActive, version = l_isActiveMfile(mrc, v.fullName, sn, fn) if (show_hidden or isActive) then if (t[sn] == nil) then t[sn] = { Description = v.Description, versionA = { }, name = sn} @@ -1219,7 +1225,7 @@ function M._Level1(self, dbT, providedByT, possibleA, sn, key, helpFlg) if (T) then dbg.print{"Have T\n"} for fn, v in pairsByKeys(T) do - local isActive, version = isActiveMFile(mrc, v.fullName, sn, fn) + local isActive, version = l_isActiveMfile(mrc, v.fullName, sn, fn) if (show_hidden or isActive) then local kk = sn .. "/" .. parseVersion(version) if (fullVT[kk] == nil) then diff --git a/src/utils.lua b/src/utils.lua index 0c314ea97..93964e0d0 100644 --- a/src/utils.lua +++ b/src/utils.lua @@ -510,11 +510,6 @@ function getModuleRCT(remove_MRC_home) return A end -function isActiveMFile(mrc, full, sn, fn) - local version = extractVersion(full, sn) or "" - return mrc:isVisible{fullName=full, sn=sn, fn=fn}, version -end - ----------------------------------------------------------------------- -- This function decides if the modulefile is a marked default -- The rule is that a marked default is given in the first character From 83a13d8fc8d48e48fb50c1d4ec8e2a3d8064e015 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 8 Aug 2024 21:29:17 -0600 Subject: [PATCH 070/198] Comment about the top of TCL modulefiles --- docs/source/060_locating.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/060_locating.rst b/docs/source/060_locating.rst index f500cff99..c8cc4d7be 100644 --- a/docs/source/060_locating.rst +++ b/docs/source/060_locating.rst @@ -26,8 +26,8 @@ Lmod will report the following directory tree like this:: We note that the ``.lua`` extension has not been reported above. The ``.lua`` extension tells Lmod that the contents of the file are written in the Lua language. All other files are assumed to be -written in TCL. - +written in TCL. Note that all TCL modulefiles **MUST** start with +the string **#%Module** or it will be silently ignored. Here the name of the file or directory under ``/opt/apps/modulefiles`` is the name of the module. The normal way to specify a module is to From 4cdfed761acf30332b6220fb629a3446cca8319b Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 8 Aug 2024 21:29:44 -0600 Subject: [PATCH 071/198] Comment update --- contrib/TACC/CollectModuleData4Web.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/TACC/CollectModuleData4Web.sh b/contrib/TACC/CollectModuleData4Web.sh index 9b37344e0..782fd29b8 100755 --- a/contrib/TACC/CollectModuleData4Web.sh +++ b/contrib/TACC/CollectModuleData4Web.sh @@ -2,7 +2,7 @@ # -*- shell-script -*- ###################################################################### -# find ADMIN_DIR +# find ADMIN_DIR (which is where this shell script is found!) SCRIPT_NAME="${BASH_SOURCE[0]:-${(%):-%x}}" SCRIPT_DIR=${SCRIPT_NAME%/*} From 4c8ca8d4c579a3e6a9a4ab0c2aa10e321b9679d8 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Thu, 8 Aug 2024 21:30:04 -0600 Subject: [PATCH 072/198] Update TAGS* --- TAGS | 1974 +++---- TAGS.world | 15537 ++++++++++++++++++++++++++------------------------- 2 files changed, 8988 insertions(+), 8523 deletions(-) diff --git a/TAGS b/TAGS index b051dc209..a44f5ca4b 100644 --- a/TAGS +++ b/TAGS @@ -190,7 +190,7 @@ function M.apply(apply123,5606 function M.exists(133,5813 function M.exists(exists133,5813 -src/Spider.lua,2153 +src/Spider.lua,2194 function M.new(69,2677 function M.new(new69,2677 local function l_nothing(77,2802 @@ -198,54 +198,55 @@ local function l_process(80,2834 function processLPATH(94,3221 function processPATH(98,3284 function processDIR(102,3345 -local function l_processNewModulePATH(106,3404 -function Spider_dynamic_mpath(131,4202 -function Spider_append_path(139,4436 -local function l_loadMe(168,5310 -local function l_findModules(189,6130 -local function l_findChangeMPATH_modules(212,7032 -function M.searchSpiderDB(236,7891 -function M.searchSpiderDB(searchSpiderDB236,7891 -function M.findAllModules(295,9435 -function M.findAllModules(findAllModules295,9435 -function extend(408,12821 -function reverse(416,12944 -function copy(425,13071 -local function l_build_parentT(482,15217 - local function l_build_parentT_helper(487,15383 -local function l_build_mpathParentT(536,16808 -local function l_search_mpathParentT(566,17616 -local function l_build_keepT(582,17962 -function M.buildDbT(603,18519 -function M.buildDbT(buildDbT603,18519 - local function l_cmp(623,19219 - local function l_buildDbT_helper(626,19280 -function M.buildProvideByT(697,21478 -function M.buildProvideByT(buildProvideByT697,21478 - local function l_cmp(730,22847 -function M.Level0_terse(751,23254 -function M.Level0_terse(Level0_terse751,23254 -function M.Level0(789,24329 -function M.Level0(Level0789,24329 -local function l_case_independent_cmp_by_name(815,24956 -function M.Level0Helper(826,25170 -function M.Level0Helper(Level0Helper826,25170 -function M.setExactMatch(905,27693 -function M.setExactMatch(setExactMatch905,27693 -function M.getExactMatch(909,27758 -function M.getExactMatch(getExactMatch909,27758 -function M.spiderSearch(913,27816 -function M.spiderSearch(spiderSearch913,27816 -function M._Level1(1071,32590 -function M._Level1(_Level11071,32590 - local function l_countEntries(1088,33184 - local function cmp(1124,34172 -function M._Level2(1329,40291 -function M._Level2(_Level21329,40291 -function M.listModules(1513,45714 -function M.listModules(listModules1513,45714 -function M.dictModules(1524,45896 -function M.dictModules(dictModules1524,45896 +local function l_isActiveMfile(106,3404 +local function l_processNewModulePATH(112,3572 +function Spider_dynamic_mpath(137,4370 +function Spider_append_path(145,4604 +local function l_loadMe(174,5478 +local function l_findModules(195,6298 +local function l_findChangeMPATH_modules(218,7200 +function M.searchSpiderDB(242,8059 +function M.searchSpiderDB(searchSpiderDB242,8059 +function M.findAllModules(301,9603 +function M.findAllModules(findAllModules301,9603 +function extend(414,12989 +function reverse(422,13112 +function copy(431,13239 +local function l_build_parentT(488,15385 + local function l_build_parentT_helper(493,15551 +local function l_build_mpathParentT(542,16976 +local function l_search_mpathParentT(572,17784 +local function l_build_keepT(588,18130 +function M.buildDbT(609,18687 +function M.buildDbT(buildDbT609,18687 + local function l_cmp(629,19387 + local function l_buildDbT_helper(632,19448 +function M.buildProvideByT(703,21646 +function M.buildProvideByT(buildProvideByT703,21646 + local function l_cmp(736,23015 +function M.Level0_terse(757,23422 +function M.Level0_terse(Level0_terse757,23422 +function M.Level0(795,24499 +function M.Level0(Level0795,24499 +local function l_case_independent_cmp_by_name(821,25126 +function M.Level0Helper(832,25340 +function M.Level0Helper(Level0Helper832,25340 +function M.setExactMatch(911,27865 +function M.setExactMatch(setExactMatch911,27865 +function M.getExactMatch(915,27930 +function M.getExactMatch(getExactMatch915,27930 +function M.spiderSearch(919,27988 +function M.spiderSearch(spiderSearch919,27988 +function M._Level1(1077,32762 +function M._Level1(_Level11077,32762 + local function l_countEntries(1094,33356 + local function cmp(1130,34344 +function M._Level2(1335,40465 +function M._Level2(_Level21335,40465 +function M.listModules(1519,45888 +function M.listModules(listModules1519,45888 +function M.dictModules(1530,46070 +function M.dictModules(dictModules1530,46070 src/MN_Latest.lua,174 function M.show(49,2034 @@ -354,165 +355,165 @@ function M.isEmpty(301,10425 function M.isEmpty(isEmpty301,10425 function M.setenv(315,10946 function M.setenv(setenv315,10946 -function M.setenv_env(345,11782 -function M.setenv_env(setenv_env345,11782 -function M.unsetenv(360,12336 -function M.unsetenv(unsetenv360,12336 -function M.pushenv(396,13472 -function M.pushenv(pushenv396,13472 -function M.popenv(452,15104 -function M.popenv(popenv452,15104 -function M.prepend_path(495,16303 -function M.prepend_path(prepend_path495,16303 -function M.append_path(528,17347 -function M.append_path(append_path528,17347 -function M.remove_path(559,18390 -function M.remove_path(remove_path559,18390 -function M.remove_path_first(594,19590 -function M.remove_path_first(remove_path_first594,19590 -function M.remove_path_last(603,19882 -function M.remove_path_last(remove_path_last603,19882 -function M.set_alias(616,20271 -function M.set_alias(set_alias616,20271 -function M.unset_alias(638,20904 -function M.unset_alias(unset_alias638,20904 -function M.set_shell_function(658,21515 -function M.set_shell_function(set_shell_function658,21515 -function M.unset_shell_function(681,22312 -function M.unset_shell_function(unset_shell_function681,22312 -function M.mode(700,22947 -function M.mode(mode700,22947 -function M.execute(708,23240 -function M.execute(execute708,23240 -function M.myShellName(727,23756 -function M.myShellName(myShellName727,23756 -function M.myShellType(731,23833 -function M.myShellType(myShellType731,23833 -function M.myFileName(740,24078 -function M.myFileName(myFileName740,24078 -function M.myModuleFullName(748,24360 -function M.myModuleFullName(myModuleFullName748,24360 -function M.myModuleUsrName(757,24725 -function M.myModuleUsrName(myModuleUsrName757,24725 -function M.myModuleName(766,25030 -function M.myModuleName(myModuleName766,25030 -function M.myModuleVersion(775,25349 -function M.myModuleVersion(myModuleVersion775,25349 -local function l_generateMsg(780,25457 -function M.msg_raw(799,26027 -function M.msg_raw(msg_raw799,26027 -function M.message(813,26330 -function M.message(message813,26330 -function M.warning(836,27045 -function M.warning(warning836,27045 -function M.error(851,27562 -function M.error(error851,27562 -function M.quiet(884,28448 -function M.quiet(quiet884,28448 -function M.mustLoad(888,28502 -function M.mustLoad(mustLoad888,28502 -function M.registerDependencyCk(898,28709 -function M.registerDependencyCk(registerDependencyCk898,28709 -function M.performDependencyCk(902,28777 -function M.performDependencyCk(performDependencyCk902,28777 -function M.dependencyCk(912,29050 -function M.dependencyCk(dependencyCk912,29050 -function M.dependencyCk_any(934,29601 -function M.dependencyCk_any(dependencyCk_any934,29601 -function M.reportMissingDepModules(966,30437 -function M.reportMissingDepModules(reportMissingDepModules966,30437 -function M.depends_on(988,31085 -function M.depends_on(depends_on988,31085 -function M.depends_on_any(1027,32021 -function M.depends_on_any(depends_on_any1027,32021 -function M.forgo(1073,33258 -function M.forgo(forgo1073,33258 -function M.forgo_any(1104,34114 -function M.forgo_any(forgo_any1104,34114 -function M.load_usr(1152,35589 -function M.load_usr(load_usr1152,35589 -function mAList(1174,36214 -function M.load(1182,36347 -function M.load(load1182,36347 -function M.load_any(1199,36661 -function M.load_any(load_any1199,36661 -function M.mgrload(1229,37237 -function M.mgrload(mgrload1229,37237 -function M.mgr_unload(1246,37605 -function M.mgr_unload(mgr_unload1246,37605 -function M.try_load(1261,38101 -function M.try_load(try_load1261,38101 -function M.unload(1272,38431 -function M.unload(unload1272,38431 -function M.build_unload(1287,38719 -function M.build_unload(build_unload1287,38719 -function M.do_not_build_unload(1293,38877 -function M.do_not_build_unload(do_not_build_unload1293,38877 -function M.unload_usr(1304,39214 -function M.unload_usr(unload_usr1304,39214 -function M.fake_load(1323,39716 -function M.fake_load(fake_load1323,39716 -function M.conflict(1335,40093 -function M.conflict(conflict1335,40093 -function M.removeConflict(1369,41051 -function M.removeConflict(removeConflict1369,41051 -function M.prereq(1386,41601 -function M.prereq(prereq1386,41601 -function M.prereq_any(1413,42349 -function M.prereq_any(prereq_any1413,42349 -function M.familyStackPush(1444,43226 -function M.familyStackPush(familyStackPush1444,43226 -function M.familyStackTop(1461,43922 -function M.familyStackTop(familyStackTop1461,43922 -function M.familyStackPop(1471,44229 -function M.familyStackPop(familyStackPop1471,44229 -function M.processFamilyStack(1482,44564 -function M.processFamilyStack(processFamilyStack1482,44564 -function M.familyStackEmpty(1492,44873 -function M.familyStackEmpty(familyStackEmpty1492,44873 -function M.family(1501,45184 -function M.family(family1501,45184 -function M.unset_family(1529,46118 -function M.unset_family(unset_family1529,46118 -function M.registerAdminMsg(1536,46314 -function M.registerAdminMsg(registerAdminMsg1536,46314 -function M.reportAdminMsgs(1573,47434 -function M.reportAdminMsgs(reportAdminMsgs1573,47434 -function M.loaded_modules(1603,48474 -function M.loaded_modules(loaded_modules1603,48474 -function M.add_property(1618,48942 -function M.add_property(add_property1618,48942 -function M.remove_property(1632,49396 -function M.remove_property(remove_property1632,49396 -function purgeFlg(1641,49656 -function M.purge(1646,49703 -function M.purge(purge1646,49703 -function M.tcl_mode(1677,50367 -function M.tcl_mode(tcl_mode1677,50367 -function M.is_spider(1684,50603 -function M.is_spider(is_spider1684,50603 -function M.inherit(1695,51029 -function M.inherit(inherit1695,51029 -function M.source_sh(1702,51186 -function M.source_sh(source_sh1702,51186 -function M.un_source_sh(1727,52055 -function M.un_source_sh(un_source_sh1727,52055 -function M.complete(1742,52664 -function M.complete(complete1742,52664 -function M.uncomplete(1758,53131 -function M.uncomplete(uncomplete1758,53131 -function M.color_banner(1776,53601 -function M.color_banner(color_banner1776,53601 -function M.set_errorFunc(1786,53829 -function M.set_errorFunc(set_errorFunc1786,53829 -function M.LmodBreak(1791,53939 -function M.LmodBreak(LmodBreak1791,53939 -function M.userInGroups(1825,54922 -function M.userInGroups(userInGroups1825,54922 -function M.missing_module(1844,55345 -function M.missing_module(missing_module1844,55345 -function M.haveDynamicMPATH(1848,55442 -function M.haveDynamicMPATH(haveDynamicMPATH1848,55442 +function M.setenv_env(345,11790 +function M.setenv_env(setenv_env345,11790 +function M.unsetenv(360,12344 +function M.unsetenv(unsetenv360,12344 +function M.pushenv(396,13480 +function M.pushenv(pushenv396,13480 +function M.popenv(452,15120 +function M.popenv(popenv452,15120 +function M.prepend_path(495,16327 +function M.prepend_path(prepend_path495,16327 +function M.append_path(528,17371 +function M.append_path(append_path528,17371 +function M.remove_path(559,18414 +function M.remove_path(remove_path559,18414 +function M.remove_path_first(594,19614 +function M.remove_path_first(remove_path_first594,19614 +function M.remove_path_last(603,19906 +function M.remove_path_last(remove_path_last603,19906 +function M.set_alias(616,20295 +function M.set_alias(set_alias616,20295 +function M.unset_alias(638,20936 +function M.unset_alias(unset_alias638,20936 +function M.set_shell_function(658,21555 +function M.set_shell_function(set_shell_function658,21555 +function M.unset_shell_function(681,22360 +function M.unset_shell_function(unset_shell_function681,22360 +function M.mode(700,23003 +function M.mode(mode700,23003 +function M.execute(708,23296 +function M.execute(execute708,23296 +function M.myShellName(727,23812 +function M.myShellName(myShellName727,23812 +function M.myShellType(731,23889 +function M.myShellType(myShellType731,23889 +function M.myFileName(740,24134 +function M.myFileName(myFileName740,24134 +function M.myModuleFullName(748,24416 +function M.myModuleFullName(myModuleFullName748,24416 +function M.myModuleUsrName(757,24781 +function M.myModuleUsrName(myModuleUsrName757,24781 +function M.myModuleName(766,25086 +function M.myModuleName(myModuleName766,25086 +function M.myModuleVersion(775,25405 +function M.myModuleVersion(myModuleVersion775,25405 +local function l_generateMsg(780,25513 +function M.msg_raw(799,26083 +function M.msg_raw(msg_raw799,26083 +function M.message(813,26386 +function M.message(message813,26386 +function M.warning(836,27101 +function M.warning(warning836,27101 +function M.error(851,27618 +function M.error(error851,27618 +function M.quiet(884,28504 +function M.quiet(quiet884,28504 +function M.mustLoad(888,28558 +function M.mustLoad(mustLoad888,28558 +function M.registerDependencyCk(898,28765 +function M.registerDependencyCk(registerDependencyCk898,28765 +function M.performDependencyCk(902,28833 +function M.performDependencyCk(performDependencyCk902,28833 +function M.dependencyCk(912,29106 +function M.dependencyCk(dependencyCk912,29106 +function M.dependencyCk_any(934,29657 +function M.dependencyCk_any(dependencyCk_any934,29657 +function M.reportMissingDepModules(966,30493 +function M.reportMissingDepModules(reportMissingDepModules966,30493 +function M.depends_on(988,31141 +function M.depends_on(depends_on988,31141 +function M.depends_on_any(1027,32077 +function M.depends_on_any(depends_on_any1027,32077 +function M.forgo(1073,33314 +function M.forgo(forgo1073,33314 +function M.forgo_any(1104,34170 +function M.forgo_any(forgo_any1104,34170 +function M.load_usr(1152,35645 +function M.load_usr(load_usr1152,35645 +function mAList(1174,36270 +function M.load(1182,36403 +function M.load(load1182,36403 +function M.load_any(1199,36717 +function M.load_any(load_any1199,36717 +function M.mgrload(1229,37293 +function M.mgrload(mgrload1229,37293 +function M.mgr_unload(1246,37661 +function M.mgr_unload(mgr_unload1246,37661 +function M.try_load(1261,38157 +function M.try_load(try_load1261,38157 +function M.unload(1272,38487 +function M.unload(unload1272,38487 +function M.build_unload(1287,38775 +function M.build_unload(build_unload1287,38775 +function M.do_not_build_unload(1293,38933 +function M.do_not_build_unload(do_not_build_unload1293,38933 +function M.unload_usr(1304,39270 +function M.unload_usr(unload_usr1304,39270 +function M.fake_load(1323,39772 +function M.fake_load(fake_load1323,39772 +function M.conflict(1335,40149 +function M.conflict(conflict1335,40149 +function M.removeConflict(1369,41107 +function M.removeConflict(removeConflict1369,41107 +function M.prereq(1386,41657 +function M.prereq(prereq1386,41657 +function M.prereq_any(1413,42405 +function M.prereq_any(prereq_any1413,42405 +function M.familyStackPush(1444,43282 +function M.familyStackPush(familyStackPush1444,43282 +function M.familyStackTop(1461,43978 +function M.familyStackTop(familyStackTop1461,43978 +function M.familyStackPop(1471,44285 +function M.familyStackPop(familyStackPop1471,44285 +function M.processFamilyStack(1482,44620 +function M.processFamilyStack(processFamilyStack1482,44620 +function M.familyStackEmpty(1492,44929 +function M.familyStackEmpty(familyStackEmpty1492,44929 +function M.family(1501,45240 +function M.family(family1501,45240 +function M.unset_family(1529,46174 +function M.unset_family(unset_family1529,46174 +function M.registerAdminMsg(1536,46370 +function M.registerAdminMsg(registerAdminMsg1536,46370 +function M.reportAdminMsgs(1573,47490 +function M.reportAdminMsgs(reportAdminMsgs1573,47490 +function M.loaded_modules(1603,48530 +function M.loaded_modules(loaded_modules1603,48530 +function M.add_property(1618,48998 +function M.add_property(add_property1618,48998 +function M.remove_property(1632,49460 +function M.remove_property(remove_property1632,49460 +function purgeFlg(1641,49728 +function M.purge(1646,49775 +function M.purge(purge1646,49775 +function M.tcl_mode(1677,50439 +function M.tcl_mode(tcl_mode1677,50439 +function M.is_spider(1684,50675 +function M.is_spider(is_spider1684,50675 +function M.inherit(1695,51101 +function M.inherit(inherit1695,51101 +function M.source_sh(1702,51258 +function M.source_sh(source_sh1702,51258 +function M.un_source_sh(1727,52127 +function M.un_source_sh(un_source_sh1727,52127 +function M.complete(1742,52736 +function M.complete(complete1742,52736 +function M.uncomplete(1758,53203 +function M.uncomplete(uncomplete1758,53203 +function M.color_banner(1776,53673 +function M.color_banner(color_banner1776,53673 +function M.set_errorFunc(1786,53901 +function M.set_errorFunc(set_errorFunc1786,53901 +function M.LmodBreak(1791,54011 +function M.LmodBreak(LmodBreak1791,54011 +function M.userInGroups(1825,54994 +function M.userInGroups(userInGroups1825,54994 +function M.missing_module(1844,55417 +function M.missing_module(missing_module1844,55417 +function M.haveDynamicMPATH(1848,55514 +function M.haveDynamicMPATH(haveDynamicMPATH1848,55514 src/CTimer.lua,212 local function l_new(47,1925 @@ -526,7 +527,7 @@ function M.done(done101,3595 src/mrc_load.lua,27 function mrc_load(44,1894 -src/MT.lua,5877 +src/MT.lua,6038 function M.name(77,2958 function M.name(name77,2958 local function l_mt_version(81,3002 @@ -548,170 +549,174 @@ function M.set_MPATH_change_flag(335,10084 function M.set_MPATH_change_flag(set_MPATH_change_flag335,10084 function M.reset_MPATH_change_flag(340,10206 function M.reset_MPATH_change_flag(reset_MPATH_change_flag340,10206 -function M.add_sh2mf_cmds(345,10283 -function M.add_sh2mf_cmds(add_sh2mf_cmds345,10283 -function M.get_sh2mf_cmds(360,10650 -function M.get_sh2mf_cmds(get_sh2mf_cmds360,10650 -function M.setStatus(376,11081 -function M.setStatus(setStatus376,11081 -function M.status(387,11342 -function M.status(status387,11342 -function M.exists(395,11477 -function M.exists(exists395,11477 -function M.setRebuildTime(404,11807 -function M.setRebuildTime(setRebuildTime404,11807 -local function l_setLoadOrder(414,12170 -function M.serializeTbl(425,12368 -function M.serializeTbl(serializeTbl425,12368 -function M.encodeMT(478,13680 -function M.encodeMT(encodeMT478,13680 -function M.remove(487,13959 -function M.remove(remove487,13959 -local function l_build_AB(492,14034 -function M.list(517,14949 -function M.list(list517,14949 - local function l_loadOrder_cmp(569,17187 -function M.empty(595,17592 -function M.empty(empty595,17592 -function M.add_property(608,17926 -function M.add_property(add_property608,17926 -function M.remove_property(635,18736 -function M.remove_property(remove_property635,18736 -function M.list_w_property(677,20155 -function M.list_w_property(list_w_property677,20155 -function M.haveProperty(707,21206 -function M.haveProperty(haveProperty707,21206 -function M.have(721,21685 -function M.have(have721,21685 -function M.find_possible_sn(729,21863 -function M.find_possible_sn(find_possible_sn729,21863 -function M.lookup_w_userName(748,22245 -function M.lookup_w_userName(lookup_w_userName748,22245 -function M.userName(775,22831 -function M.userName(userName775,22831 -function M.fullName(783,22970 -function M.fullName(fullName783,22970 -function M.wV(791,23109 -function M.wV(wV791,23109 -function M.fn(799,23236 -function M.fn(fn799,23236 -function M.version(807,23363 -function M.version(version807,23363 -function M.stackDepth(815,23520 -function M.stackDepth(stackDepth815,23520 -function M.safely_incr_ref_count(823,23667 -function M.safely_incr_ref_count(safely_incr_ref_count823,23667 -function M.decr_ref_count(841,24283 -function M.decr_ref_count(decr_ref_count841,24283 -function M.get_ref_count(853,24664 -function M.get_ref_count(get_ref_count853,24664 -function M.get_depends_on_anyA(862,24913 -function M.get_depends_on_anyA(get_depends_on_anyA862,24913 -function M.save_depends_on_any(870,25092 -function M.save_depends_on_any(save_depends_on_any870,25092 -function M.pop_depends_on_any(878,25300 -function M.pop_depends_on_any(pop_depends_on_any878,25300 -function M.pop_depends_on_any_ck(888,25572 -function M.pop_depends_on_any_ck(pop_depends_on_any_ck888,25572 -function M.updateMPathA(906,26163 -function M.updateMPathA(updateMPathA906,26163 -function M.modulePathA(917,26491 -function M.modulePathA(modulePathA917,26491 -function M.maxDepthT(921,26547 -function M.maxDepthT(maxDepthT921,26547 -function M.getShortTime(928,26735 -function M.getShortTime(getShortTime928,26735 -function M.getRebuildTime(935,26929 -function M.getRebuildTime(getRebuildTime935,26929 -function M.setRebuildTime(944,27254 -function M.setRebuildTime(setRebuildTime944,27254 -function M.addStickyA(955,27632 -function M.addStickyA(addStickyA955,27632 -function M.getStickyA(965,28007 -function M.getStickyA(getStickyA965,28007 -function M.userLoad(978,28496 -function M.userLoad(userLoad978,28496 -local function l_columnList(986,28750 -function M.reportChanges(1005,29415 -function M.reportChanges(reportChanges1005,29415 -local function l_buildFamilyPrefix(1070,31371 -function M.setfamily(1088,31812 -function M.setfamily(setfamily1088,31812 -function M.unsetfamily(1104,32293 -function M.unsetfamily(unsetfamily1104,32293 -function M.getfamily(1118,32693 -function M.getfamily(getfamily1118,32693 -function M.pushInheritFn(1130,33031 -function M.pushInheritFn(pushInheritFn1130,33031 -function M.popInheritFn(1145,33617 -function M.popInheritFn(popInheritFn1145,33617 -function M.hideHash(1162,34153 -function M.hideHash(hideHash1162,34153 -function M.getHash(1176,34511 -function M.getHash(getHash1176,34511 -function M.setHashSum(1188,34839 -function M.setHashSum(setHashSum1188,34839 -function M.getMTfromFile(1255,37044 -function M.getMTfromFile(getMTfromFile1255,37044 -function M.extractModulesFiles(1472,44384 -function M.extractModulesFiles(extractModulesFiles1472,44384 -function M.setMpathRefCountT(1501,45063 -function M.setMpathRefCountT(setMpathRefCountT1501,45063 -function M.hideMpathRefCountT(1504,45148 -function M.hideMpathRefCountT(hideMpathRefCountT1504,45148 -function M.resetMPATH2system(1508,45229 -function M.resetMPATH2system(resetMPATH2system1508,45229 -function M.name_w_possible_alias(1514,45406 -function M.name_w_possible_alias(name_w_possible_alias1514,45406 -function M.registerConflicts(1532,45978 -function M.registerConflicts(registerConflicts1532,45978 -function M.removeConflicts(1548,46473 -function M.removeConflicts(removeConflicts1548,46473 -function M.haveDSConflict(1557,46690 -function M.haveDSConflict(haveDSConflict1557,46690 +function M.add_actionA(345,10283 +function M.add_actionA(add_actionA345,10283 +function M.get_actionA(354,10525 +function M.get_actionA(get_actionA354,10525 +function M.add_sh2mf_cmds(363,10703 +function M.add_sh2mf_cmds(add_sh2mf_cmds363,10703 +function M.get_sh2mf_cmds(378,11070 +function M.get_sh2mf_cmds(get_sh2mf_cmds378,11070 +function M.setStatus(394,11501 +function M.setStatus(setStatus394,11501 +function M.status(405,11762 +function M.status(status405,11762 +function M.exists(413,11897 +function M.exists(exists413,11897 +function M.setRebuildTime(422,12227 +function M.setRebuildTime(setRebuildTime422,12227 +local function l_setLoadOrder(432,12590 +function M.serializeTbl(443,12788 +function M.serializeTbl(serializeTbl443,12788 +function M.encodeMT(496,14100 +function M.encodeMT(encodeMT496,14100 +function M.remove(505,14379 +function M.remove(remove505,14379 +local function l_build_AB(510,14454 +function M.list(535,15369 +function M.list(list535,15369 + local function l_loadOrder_cmp(587,17607 +function M.empty(613,18012 +function M.empty(empty613,18012 +function M.add_property(626,18346 +function M.add_property(add_property626,18346 +function M.remove_property(653,19156 +function M.remove_property(remove_property653,19156 +function M.list_w_property(695,20575 +function M.list_w_property(list_w_property695,20575 +function M.haveProperty(725,21626 +function M.haveProperty(haveProperty725,21626 +function M.have(739,22105 +function M.have(have739,22105 +function M.find_possible_sn(747,22283 +function M.find_possible_sn(find_possible_sn747,22283 +function M.lookup_w_userName(766,22665 +function M.lookup_w_userName(lookup_w_userName766,22665 +function M.userName(793,23251 +function M.userName(userName793,23251 +function M.fullName(801,23390 +function M.fullName(fullName801,23390 +function M.wV(809,23529 +function M.wV(wV809,23529 +function M.fn(817,23656 +function M.fn(fn817,23656 +function M.version(825,23783 +function M.version(version825,23783 +function M.stackDepth(833,23940 +function M.stackDepth(stackDepth833,23940 +function M.safely_incr_ref_count(841,24087 +function M.safely_incr_ref_count(safely_incr_ref_count841,24087 +function M.decr_ref_count(859,24703 +function M.decr_ref_count(decr_ref_count859,24703 +function M.get_ref_count(871,25084 +function M.get_ref_count(get_ref_count871,25084 +function M.get_depends_on_anyA(880,25333 +function M.get_depends_on_anyA(get_depends_on_anyA880,25333 +function M.save_depends_on_any(888,25512 +function M.save_depends_on_any(save_depends_on_any888,25512 +function M.pop_depends_on_any(896,25720 +function M.pop_depends_on_any(pop_depends_on_any896,25720 +function M.pop_depends_on_any_ck(906,25992 +function M.pop_depends_on_any_ck(pop_depends_on_any_ck906,25992 +function M.updateMPathA(924,26583 +function M.updateMPathA(updateMPathA924,26583 +function M.modulePathA(935,26911 +function M.modulePathA(modulePathA935,26911 +function M.maxDepthT(939,26967 +function M.maxDepthT(maxDepthT939,26967 +function M.getShortTime(946,27155 +function M.getShortTime(getShortTime946,27155 +function M.getRebuildTime(953,27349 +function M.getRebuildTime(getRebuildTime953,27349 +function M.setRebuildTime(962,27674 +function M.setRebuildTime(setRebuildTime962,27674 +function M.addStickyA(973,28052 +function M.addStickyA(addStickyA973,28052 +function M.getStickyA(983,28427 +function M.getStickyA(getStickyA983,28427 +function M.userLoad(996,28916 +function M.userLoad(userLoad996,28916 +local function l_columnList(1004,29170 +function M.reportChanges(1023,29835 +function M.reportChanges(reportChanges1023,29835 +local function l_buildFamilyPrefix(1088,31791 +function M.setfamily(1106,32232 +function M.setfamily(setfamily1106,32232 +function M.unsetfamily(1122,32713 +function M.unsetfamily(unsetfamily1122,32713 +function M.getfamily(1136,33113 +function M.getfamily(getfamily1136,33113 +function M.pushInheritFn(1148,33451 +function M.pushInheritFn(pushInheritFn1148,33451 +function M.popInheritFn(1163,34037 +function M.popInheritFn(popInheritFn1163,34037 +function M.hideHash(1180,34573 +function M.hideHash(hideHash1180,34573 +function M.getHash(1194,34931 +function M.getHash(getHash1194,34931 +function M.setHashSum(1206,35259 +function M.setHashSum(setHashSum1206,35259 +function M.getMTfromFile(1273,37464 +function M.getMTfromFile(getMTfromFile1273,37464 +function M.extractModulesFiles(1492,44851 +function M.extractModulesFiles(extractModulesFiles1492,44851 +function M.setMpathRefCountT(1521,45530 +function M.setMpathRefCountT(setMpathRefCountT1521,45530 +function M.hideMpathRefCountT(1524,45615 +function M.hideMpathRefCountT(hideMpathRefCountT1524,45615 +function M.resetMPATH2system(1528,45696 +function M.resetMPATH2system(resetMPATH2system1528,45696 +function M.name_w_possible_alias(1534,45873 +function M.name_w_possible_alias(name_w_possible_alias1534,45873 +function M.registerConflicts(1552,46445 +function M.registerConflicts(registerConflicts1552,46445 +function M.removeConflicts(1568,46940 +function M.removeConflicts(removeConflicts1568,46940 +function M.haveDSConflict(1577,47157 +function M.haveDSConflict(haveDSConflict1577,47157 src/FrameStk.lua,1303 local function l_new(47,1953 -function M.singleton(62,2281 -function M.singleton(singleton62,2281 -function M.__clear(76,2632 -function M.__clear(__clear76,2632 -function M.resetMPATH2system(86,2842 -function M.resetMPATH2system(resetMPATH2system86,2842 -function M.push(95,3083 -function M.push(push95,3083 -function M.LmodBreak(106,3423 -function M.LmodBreak(LmodBreak106,3423 -function M.pop(113,3647 -function M.pop(pop113,3647 -function M.empty(125,4021 -function M.empty(empty125,4021 -function M.atTop(129,4079 -function M.atTop(atTop129,4079 -function M.stackDepth(133,4137 -function M.stackDepth(stackDepth133,4137 -function M.fullName(137,4197 -function M.fullName(fullName137,4197 -function M.mname(143,4326 -function M.mname(mname143,4326 -function M.userName(148,4418 -function M.userName(userName148,4418 -function M.fn(154,4547 -function M.fn(fn154,4547 -function M.sn(160,4664 -function M.sn(sn160,4664 -function M.version(166,4781 -function M.version(version166,4781 -function M.mt(172,4908 -function M.mt(mt172,4908 -function M.origMT(177,4994 -function M.origMT(origMT177,4994 -function M.varT(181,5047 -function M.varT(varT181,5047 -function M.count(186,5137 -function M.count(count186,5137 -function M.traceBack(190,5188 -function M.traceBack(traceBack190,5188 +function M.singleton(63,2323 +function M.singleton(singleton63,2323 +function M.__clear(77,2674 +function M.__clear(__clear77,2674 +function M.resetMPATH2system(87,2884 +function M.resetMPATH2system(resetMPATH2system87,2884 +function M.push(96,3125 +function M.push(push96,3125 +function M.LmodBreak(107,3465 +function M.LmodBreak(LmodBreak107,3465 +function M.pop(114,3689 +function M.pop(pop114,3689 +function M.empty(126,4063 +function M.empty(empty126,4063 +function M.atTop(130,4121 +function M.atTop(atTop130,4121 +function M.stackDepth(134,4179 +function M.stackDepth(stackDepth134,4179 +function M.fullName(138,4239 +function M.fullName(fullName138,4239 +function M.mname(144,4387 +function M.mname(mname144,4387 +function M.userName(149,4479 +function M.userName(userName149,4479 +function M.fn(155,4627 +function M.fn(fn155,4627 +function M.sn(161,4763 +function M.sn(sn161,4763 +function M.version(167,4899 +function M.version(version167,4899 +function M.mt(173,5045 +function M.mt(mt173,5045 +function M.origMT(178,5131 +function M.origMT(origMT178,5131 +function M.varT(182,5184 +function M.varT(varT182,5184 +function M.count(187,5274 +function M.count(count187,5274 +function M.traceBack(191,5325 +function M.traceBack(traceBack191,5325 src/printEnvT.lua,78 function cmdDir(46,1093 @@ -760,7 +765,7 @@ function M.date(date19,403 function M.name(20,458 function M.name(name20,458 -src/MRC.lua,1783 +src/MRC.lua,1745 local function l_new(77,2888 function M.singleton(110,4066 function M.singleton(singleton110,4066 @@ -792,20 +797,19 @@ function M.extract(416,12952 function M.extract(extract416,12952 function M.export(423,13159 function M.export(export423,13159 -function M.getHiddenT(432,13455 -function M.getHiddenT(getHiddenT432,13455 -local function l_import_helper(459,14087 -function M.import(471,14363 -function M.import(import471,14363 -function M.isVisible(488,14874 -function M.isVisible(isVisible488,14874 -function M.update(514,15564 -function M.update(update514,15564 -function l_find_all_su_defaults(521,15712 -function M.find_wght_for_fullName(535,16074 -function M.find_wght_for_fullName(find_wght_for_fullName535,16074 -function M.applyWeights(589,17333 -function M.applyWeights(applyWeights589,17333 +local function l_getHiddenT(432,13455 +local function l_import_helper(459,14093 +function M.import(471,14369 +function M.import(import471,14369 +function M.isVisible(488,14880 +function M.isVisible(isVisible488,14880 +function M.update(514,15576 +function M.update(update514,15576 +function l_find_all_su_defaults(521,15724 +function M.find_wght_for_fullName(535,16086 +function M.find_wght_for_fullName(find_wght_for_fullName535,16086 +function M.applyWeights(589,17345 +function M.applyWeights(applyWeights589,17345 src/ReadLmodRC.lua,428 local function l_buildRC(55,2172 @@ -908,7 +912,7 @@ src/mrc_sandbox.lua,74 local function l_mrc_run5_1(79,3472 local function l_mrc_run5_2(92,4148 -src/MName.lua,2963 +src/MName.lua,2965 function M.className(52,2104 function M.className(className52,2104 local function l_lessthan(56,2159 @@ -919,72 +923,72 @@ local function l_overRide_sType(158,5205 function M.buildA(167,5525 function M.buildA(buildA167,5525 local function l_lazyEval(183,5869 -function M.valid(277,8973 -function M.valid(valid277,8973 -function M.userName(285,9079 -function M.userName(userName285,9079 -function M.origUserName(289,9136 -function M.origUserName(origUserName289,9136 -function M.sn(293,9201 -function M.sn(sn293,9201 -function M.fn(302,9364 -function M.fn(fn302,9364 -function M.version(311,9527 -function M.version(version311,9527 -function M.wV(318,9639 -function M.wV(wV318,9639 -function M.stackDepth(325,9741 -function M.stackDepth(stackDepth325,9741 -function M.setStackDepth(333,9926 -function M.setStackDepth(setStackDepth333,9926 -function M.set_ref_count(337,9998 -function M.set_ref_count(set_ref_count337,9998 -function M.set_depends_on_anyA(341,10069 -function M.set_depends_on_anyA(set_depends_on_anyA341,10069 -function M.get_depends_on_anyA(345,10172 -function M.get_depends_on_anyA(get_depends_on_anyA345,10172 -function M.ref_count(352,10308 -function M.ref_count(ref_count352,10308 -function M.fullName(359,10424 -function M.fullName(fullName359,10424 -function M.find_exact_match(428,13153 -function M.find_exact_match(find_exact_match428,13153 -function M.find_exact_match_meta_module(463,14239 -function M.find_exact_match_meta_module(find_exact_match_meta_module463,14239 -local function l_find_highest_by_key(493,15175 -function M.find_highest(532,16361 -function M.find_highest(find_highest532,16361 -function M.find_latest(536,16453 -function M.find_latest(find_latest536,16453 -function M.find_between(540,16543 -function M.find_between(find_between540,16543 -function M.find_inherit_match(587,17915 -function M.find_inherit_match(find_inherit_match587,17915 -local function l_rangeCk(591,17990 -function M.isloaded(621,19157 -function M.isloaded(isloaded621,19157 -function M.isPending(653,20104 -function M.isPending(isPending653,20104 -function M.defaultKind(666,20453 -function M.defaultKind(defaultKind666,20453 -function M.prereq(681,20756 -function M.prereq(prereq681,20756 -function M.conflictCk(715,21657 -function M.conflictCk(conflictCk715,21657 -function M.downstreamConflictCk(741,22472 -function M.downstreamConflictCk(downstreamConflictCk741,22472 -function M.set_depends_on_flag(765,23183 -function M.set_depends_on_flag(set_depends_on_flag765,23183 -function M.get_depends_on_flag(776,23438 -function M.get_depends_on_flag(get_depends_on_flag776,23438 -function M.reset(781,23564 -function M.reset(reset781,23564 -function M.actionName(788,23700 -function M.actionName(actionName788,23700 -function M.show(796,23916 -function M.show(show796,23916 -function M.print(800,23983 -function M.print(print800,23983 +function M.valid(278,9003 +function M.valid(valid278,9003 +function M.userName(286,9109 +function M.userName(userName286,9109 +function M.origUserName(290,9166 +function M.origUserName(origUserName290,9166 +function M.sn(294,9231 +function M.sn(sn294,9231 +function M.fn(303,9394 +function M.fn(fn303,9394 +function M.version(312,9557 +function M.version(version312,9557 +function M.wV(319,9669 +function M.wV(wV319,9669 +function M.stackDepth(326,9771 +function M.stackDepth(stackDepth326,9771 +function M.setStackDepth(334,9956 +function M.setStackDepth(setStackDepth334,9956 +function M.set_ref_count(338,10028 +function M.set_ref_count(set_ref_count338,10028 +function M.set_depends_on_anyA(342,10099 +function M.set_depends_on_anyA(set_depends_on_anyA342,10099 +function M.get_depends_on_anyA(346,10202 +function M.get_depends_on_anyA(get_depends_on_anyA346,10202 +function M.ref_count(353,10338 +function M.ref_count(ref_count353,10338 +function M.fullName(360,10454 +function M.fullName(fullName360,10454 +function M.find_exact_match(429,13183 +function M.find_exact_match(find_exact_match429,13183 +function M.find_exact_match_meta_module(464,14268 +function M.find_exact_match_meta_module(find_exact_match_meta_module464,14268 +local function l_find_highest_by_key(494,15204 +function M.find_highest(539,16567 +function M.find_highest(find_highest539,16567 +function M.find_latest(543,16659 +function M.find_latest(find_latest543,16659 +function M.find_between(547,16749 +function M.find_between(find_between547,16749 +function M.find_inherit_match(594,18121 +function M.find_inherit_match(find_inherit_match594,18121 +local function l_rangeCk(598,18196 +function M.isloaded(628,19381 +function M.isloaded(isloaded628,19381 +function M.isPending(660,20328 +function M.isPending(isPending660,20328 +function M.defaultKind(673,20677 +function M.defaultKind(defaultKind673,20677 +function M.prereq(688,20980 +function M.prereq(prereq688,20980 +function M.conflictCk(722,21881 +function M.conflictCk(conflictCk722,21881 +function M.downstreamConflictCk(748,22696 +function M.downstreamConflictCk(downstreamConflictCk748,22696 +function M.set_depends_on_flag(772,23407 +function M.set_depends_on_flag(set_depends_on_flag772,23407 +function M.get_depends_on_flag(783,23662 +function M.get_depends_on_flag(get_depends_on_flag783,23662 +function M.reset(788,23788 +function M.reset(reset788,23788 +function M.actionName(795,23924 +function M.actionName(actionName795,23924 +function M.show(803,24140 +function M.show(show803,24140 +function M.print(807,24207 +function M.print(print807,24207 src/MC_CheckSyntax.lua,162 function M.add_property(107,4627 @@ -995,47 +999,47 @@ function M.userInGroups(userInGroups120,5080 src/Var.lua,1544 local function l_extract_Lmod_var_table(73,2903 local function l_dynamicMP(106,3797 -local function l_dynamicMRC(123,4476 -local function l_processDynamicVars(145,5120 -local function l_extract(162,5823 -function M.new(233,8118 -function M.new(new233,8118 -function M.myName(249,8479 -function M.myName(myName249,8479 -local function l_remFunc(258,8834 -function M.remove(300,10172 -function M.remove(remove300,10172 -local function l_insertFunc(342,11633 -function M.prepend(386,13022 -function M.prepend(prepend386,13022 -function M.append(438,14606 -function M.append(append438,14606 -function M.complete(481,15907 -function M.complete(complete481,15907 -function M.uncomplete(487,16040 -function M.uncomplete(uncomplete487,16040 -function M.set(497,16311 -function M.set(set497,16311 -function M.pop(511,16764 -function M.pop(pop511,16764 -function M.prt(564,18174 -function M.prt(prt564,18174 -function M.set_ref_countT(596,19150 -function M.set_ref_countT(set_ref_countT596,19150 -function M.refCountT(603,19292 -function M.refCountT(refCountT603,19292 -function M.unset(617,19597 -function M.unset(unset617,19597 -function M.expand(638,20273 -function M.expand(expand638,20273 -function M.setAlias(771,23619 -function M.setAlias(setAlias771,23619 -function M.unsetAlias(780,23867 -function M.unsetAlias(unsetAlias780,23867 -function M.setShellFunction(790,24185 -function M.setShellFunction(setShellFunction790,24185 -function M.unsetShellFunction(798,24464 -function M.unsetShellFunction(unsetShellFunction798,24464 +local function l_dynamicMRC(127,4617 +local function l_processDynamicVars(149,5307 +local function l_extract(166,6064 +function M.new(237,8359 +function M.new(new237,8359 +function M.myName(253,8720 +function M.myName(myName253,8720 +local function l_remFunc(262,9075 +function M.remove(304,10413 +function M.remove(remove304,10413 +local function l_insertFunc(346,11888 +function M.prepend(390,13277 +function M.prepend(prepend390,13277 +function M.append(441,14846 +function M.append(append441,14846 +function M.complete(484,16141 +function M.complete(complete484,16141 +function M.uncomplete(490,16274 +function M.uncomplete(uncomplete490,16274 +function M.set(500,16545 +function M.set(set500,16545 +function M.pop(514,17007 +function M.pop(pop514,17007 +function M.prt(567,18424 +function M.prt(prt567,18424 +function M.set_ref_countT(599,19400 +function M.set_ref_countT(set_ref_countT599,19400 +function M.refCountT(606,19542 +function M.refCountT(refCountT606,19542 +function M.unset(620,19847 +function M.unset(unset620,19847 +function M.expand(641,20532 +function M.expand(expand641,20532 +function M.setAlias(774,23878 +function M.setAlias(setAlias774,23878 +function M.unsetAlias(783,24126 +function M.unsetAlias(unsetAlias783,24126 +function M.setShellFunction(793,24444 +function M.setShellFunction(setShellFunction793,24444 +function M.unsetShellFunction(801,24723 +function M.unsetShellFunction(unsetShellFunction801,24723 src/StandardPackage.lua,159 local function l_site_name_hook(59,2453 @@ -1091,7 +1095,7 @@ function M.prereq(prereq75,2575 src/tcl2lua.tcl,125 global g_loadT g_varsT g_fullName g_usrName g_shellName g_mode g_shellType g_outputA,37,1659 -set g_help $params(1160,30171 +set g_help $params(1165,30303 src/Options.lua,134 local function l_prt(73,2966 @@ -1149,7 +1153,7 @@ function M.add_property(add_property322,11026 function M.remove_property(341,11740 function M.remove_property(remove_property341,11740 -src/Hub.lua,1439 +src/Hub.lua,1485 local function l_new(71,2763 function M.singleton(84,3046 function M.singleton(singleton84,3046 @@ -1163,31 +1167,32 @@ function M.mgrload(272,8610 function M.mgrload(mgrload272,8610 function M.load(295,9259 function M.load(load295,9259 -function M.unload(488,16779 -function M.unload(unload488,16779 -function M.reloadAll(574,19954 -function M.reloadAll(reloadAll574,19954 -function M.refresh(691,24902 -function M.refresh(refresh691,24902 -function M.dependencyCk(726,26195 -function M.dependencyCk(dependencyCk726,26195 -function M.reload_sticky(759,27266 -function M.reload_sticky(reload_sticky759,27266 -function M.safeToUpdate(819,29079 -function M.safeToUpdate(safeToUpdate819,29079 -local function l_availEntry(823,29133 -local function mark_as_default(857,29935 -local function regroup_avail_blocks(862,30081 -function M.overview(935,31932 -function M.overview(overview935,31932 - local function print_overview_block(998,33762 - local function register_sn_count_in_b(1014,34391 -function M.buildExtA(1070,35928 -function M.buildExtA(buildExtA1070,35928 -function M.terse_avail(1118,37256 -function M.terse_avail(terse_avail1118,37256 -function M.avail(1191,39308 -function M.avail(avail1191,39308 +local function l_missingFn_action(483,16549 +function M.unload(509,17374 +function M.unload(unload509,17374 +function M.reloadAll(600,20702 +function M.reloadAll(reloadAll600,20702 +function M.refresh(717,25650 +function M.refresh(refresh717,25650 +function M.dependencyCk(752,26943 +function M.dependencyCk(dependencyCk752,26943 +function M.reload_sticky(785,28014 +function M.reload_sticky(reload_sticky785,28014 +function M.safeToUpdate(845,29827 +function M.safeToUpdate(safeToUpdate845,29827 +local function l_availEntry(849,29881 +local function mark_as_default(884,30728 +local function regroup_avail_blocks(889,30874 +function M.overview(962,32725 +function M.overview(overview962,32725 + local function print_overview_block(1025,34559 + local function register_sn_count_in_b(1041,35188 +function M.buildExtA(1097,36725 +function M.buildExtA(buildExtA1097,36725 +function M.terse_avail(1145,38053 +function M.terse_avail(terse_avail1145,38053 +function M.avail(1223,40355 +function M.avail(avail1223,40355 src/ml_cmd.in.lua,111 function cmdDir(92,3409 @@ -1224,71 +1229,71 @@ function load_any(209,7118 local function l_convert2table(223,7616 local function l_cleanupPathArgs(240,7941 function prepend_path(256,8338 -function append_path(268,8746 -function remove_path(279,9146 -function pushenv(292,9600 -function setenv(303,9918 -function unsetenv(314,10233 -function execute(326,10597 -function family(340,11044 -function loaded_modules(353,11390 -function inherit(365,11711 -function mode(374,11930 -function haveDynamicMPATH(379,11987 -function is_spider(388,12254 -function isloaded(398,12513 -function isAvail(406,12727 -function myFileName(415,12937 -function myModuleFullName(421,13104 -function myModuleName(427,13293 -function myModuleUsrName(433,13484 -function myModuleVersion(439,13660 -function isPending(446,13888 -function LmodError(454,14153 -function LmodWarning(461,14341 -function LmodMessage(468,14508 -function LmodMsgRaw(475,14675 -function LmodVersion(482,14854 -function myShellName(488,15015 -function myShellType(492,15071 -function whatis(498,15235 -function help(508,15515 -function userInGroups(516,15664 -function convertToCanonical(529,16078 -function prereq(539,16374 -function prereq_any(550,16804 -function conflict(560,17185 -function atleast(573,17621 -function atmost(587,18010 -function between(602,18432 -function latest(614,18786 -function set_alias(627,19071 -function unset_alias(637,19382 -function set_shell_function(647,19720 -function unset_shell_function(657,20075 -function add_property(669,20463 -function remove_property(678,20784 -function hierarchyA(690,21223 -function moduleStackTraceBack(736,22257 -function requireFullName(761,22912 -function LmodErrorExit(770,23212 -function LmodSystemError(777,23393 -function try_load(786,23824 -function unload_usr_internal(795,24070 -function unload_internal(809,24469 -function unload(827,25071 -function always_load(837,25423 -function always_unload(852,25846 -function depends_on(859,26004 -function depends_on_any(867,26247 -function extensions(875,26510 -function color_banner(883,26726 -function source_sh(888,26788 -function complete(895,26986 -function uncomplete(902,27253 -function LmodBreak(909,27508 -function purge(916,27702 -function subprocess(926,27848 +function append_path(268,8742 +function remove_path(279,9142 +function pushenv(292,9596 +function setenv(303,9914 +function unsetenv(314,10229 +function execute(326,10593 +function family(340,11040 +function loaded_modules(353,11386 +function inherit(365,11707 +function mode(374,11926 +function haveDynamicMPATH(379,11983 +function is_spider(388,12250 +function isloaded(398,12509 +function isAvail(406,12723 +function myFileName(415,12933 +function myModuleFullName(421,13100 +function myModuleName(427,13289 +function myModuleUsrName(433,13480 +function myModuleVersion(439,13656 +function isPending(446,13884 +function LmodError(454,14149 +function LmodWarning(461,14337 +function LmodMessage(468,14504 +function LmodMsgRaw(475,14671 +function LmodVersion(482,14850 +function myShellName(488,15011 +function myShellType(492,15067 +function whatis(498,15231 +function help(508,15511 +function userInGroups(516,15660 +function convertToCanonical(529,16074 +function prereq(540,16443 +function prereq_any(551,16873 +function conflict(561,17254 +function atleast(574,17690 +function atmost(588,18079 +function between(603,18501 +function latest(615,18855 +function set_alias(628,19140 +function unset_alias(638,19451 +function set_shell_function(648,19789 +function unset_shell_function(658,20144 +function add_property(670,20532 +function remove_property(679,20853 +function hierarchyA(691,21292 +function moduleStackTraceBack(737,22326 +function requireFullName(762,22981 +function LmodErrorExit(771,23281 +function LmodSystemError(778,23462 +function try_load(787,23893 +function unload_usr_internal(796,24139 +function unload_internal(810,24538 +function unload(828,25140 +function always_load(838,25492 +function always_unload(853,25915 +function depends_on(860,26073 +function depends_on_any(868,26316 +function extensions(876,26579 +function color_banner(884,26795 +function source_sh(889,26857 +function complete(896,27055 +function uncomplete(903,27322 +function LmodBreak(910,27577 +function purge(917,27771 +function subprocess(927,27917 src/loadModuleFile.lua,33 function loadModuleFile(60,2548 @@ -1389,8 +1394,8 @@ src/lmod.in.lua,128 function cmdDir(97,3490 function cmdName(103,3648 function Usage(139,4804 -function version(236,9448 -function main(245,9794 +function version(235,9425 +function main(244,9771 src/mrc_funcs.lua,129 function module_version(42,1900 @@ -1398,7 +1403,7 @@ function module_alias(49,2119 function hide_version(54,2261 function hide_modulefile(60,2389 -src/utils.lua,2044 +src/utils.lua,2010 function argsPack(76,2914 function __FILE__(82,3070 function __LINE__(86,3133 @@ -1417,47 +1422,46 @@ function findAdminFn(347,10329 function readAdmin(364,10990 function getMT(437,13198 function getModuleRCT(465,13879 -function isActiveMFile(513,15430 -function isMarked(523,15915 -function length(534,16213 -function optionTbl(543,16415 -function paired2pathT(549,16486 -function path2pathA(590,17625 -function quiet(629,18440 -function regular_cmp(636,18579 -function sanizatizeTbl(644,18636 -function setenv_lmod_version(679,19569 -function ShowCmdA(706,20337 -local function l_arg2str(722,20726 -function s_indent(744,21253 -function ShowCmdStr(752,21549 -function ShowHelpStr(804,22751 -function UUIDString(826,23335 -function case_independent_cmp(854,24179 -function activateWarning(871,24675 -function deactivateWarning(877,24847 -function haveWarnings(883,25025 -function setStatusFlag(889,25184 -function getStatusFlag(896,25373 -local function l_restoreEnv(900,25422 -local function l_runTCLprog(928,25984 -local function l_build_runTCLprog(948,26687 -function usingFastTCLInterp(962,27036 -local function l_build_accept_function(968,27273 -local function l_build_allow_dups_function(982,27570 -local function l_build_epoch_function(995,27860 -local function l_build_prepend_order_function(1030,28824 -function setSyntaxMode(1052,29347 -function checkSyntaxMode(1055,29410 -local function l_build_quarantineT(1061,29494 -function save_set_env(1074,29832 -function reset_env(1084,30050 -function initialize_lmod(1099,30379 -function tracing_msg(1164,32709 -function dynamic_shell(1178,33082 -function locatePkg(1227,34462 -function wrap_complete(1239,34695 -function unwrap_complete(1242,34765 +function isMarked(518,15756 +function length(529,16054 +function optionTbl(538,16256 +function paired2pathT(544,16327 +function path2pathA(585,17466 +function quiet(629,18488 +function regular_cmp(636,18627 +function sanizatizeTbl(644,18684 +function setenv_lmod_version(679,19617 +function ShowCmdA(706,20385 +local function l_arg2str(722,20774 +function s_indent(744,21301 +function ShowCmdStr(752,21597 +function ShowHelpStr(804,22799 +function UUIDString(826,23383 +function case_independent_cmp(854,24227 +function activateWarning(871,24723 +function deactivateWarning(877,24895 +function haveWarnings(883,25073 +function setStatusFlag(889,25232 +function getStatusFlag(896,25421 +local function l_restoreEnv(900,25470 +local function l_runTCLprog(928,26032 +local function l_build_runTCLprog(948,26735 +function usingFastTCLInterp(962,27084 +local function l_build_accept_function(968,27321 +local function l_build_allow_dups_function(982,27618 +local function l_build_epoch_function(995,27908 +local function l_build_prepend_order_function(1030,28872 +function setSyntaxMode(1052,29395 +function checkSyntaxMode(1055,29458 +local function l_build_quarantineT(1061,29542 +function save_set_env(1074,29880 +function reset_env(1084,30098 +function initialize_lmod(1099,30427 +function tracing_msg(1164,32757 +function dynamic_shell(1178,33130 +function locatePkg(1227,34510 +function wrap_complete(1239,34743 +function unwrap_complete(1242,34813 src/cmdfuncs.lua,1144 local function l_Access(76,3264 @@ -1503,42 +1507,42 @@ src/ModuleA.lua,1510 local function l_addPV(67,2795 local function l_GroupIntoModules(110,4170 local function l_build(140,5337 -local function l_find_vA(159,5909 -local function l_find_vB(194,6750 -local function l_search(235,7737 -function M.applyWeights(256,8402 -function M.applyWeights(applyWeights256,8402 -function M.__find_all_defaults(287,9414 -function M.__find_all_defaults(__find_all_defaults287,9414 - local function l_find_all_defaults_helper(294,9663 -function M.build_availA(365,12030 -function M.build_availA(build_availA365,12030 - local function l_build_availA_helper(370,12186 -function M.inherited_search(412,13595 -function M.inherited_search(inherited_search412,13595 - local function l_inherited_search_helper(415,13732 -function M.search(484,15820 -function M.search(search484,15820 -local function l_checkforNV(496,16070 -local function l_build_from_spiderT(505,16226 -function M.update(535,17280 -function M.update(update535,17280 -function M.__new(599,19482 -function M.__new(__new599,19482 -function M.moduleA(633,20497 -function M.moduleA(moduleA633,20497 -function M.isNVV(637,20552 -function M.isNVV(isNVV637,20552 -function M.spiderBuilt(641,20603 -function M.spiderBuilt(spiderBuilt641,20603 -function M.locationT(645,20666 -function M.locationT(locationT645,20666 -function M.defaultT(655,20882 -function M.defaultT(defaultT655,20882 -function M.singleton(667,21148 -function M.singleton(singleton667,21148 -function M.__clear(693,21893 -function M.__clear(__clear693,21893 +local function l_find_vA(159,5903 +local function l_find_vB(194,6751 +local function l_search(235,7747 +function M.applyWeights(258,8497 +function M.applyWeights(applyWeights258,8497 +function M.__find_all_defaults(289,9505 +function M.__find_all_defaults(__find_all_defaults289,9505 + local function l_find_all_defaults_helper(296,9752 +function M.build_availA(367,12117 +function M.build_availA(build_availA367,12117 + local function l_build_availA_helper(372,12273 +function M.inherited_search(415,13731 +function M.inherited_search(inherited_search415,13731 + local function l_inherited_search_helper(418,13868 +function M.search(487,15956 +function M.search(search487,15956 +local function l_checkforNV(504,16429 +local function l_build_from_spiderT(513,16585 +function M.update(543,17633 +function M.update(update543,17633 +function M.__new(607,19831 +function M.__new(__new607,19831 +function M.moduleA(637,20680 +function M.moduleA(moduleA637,20680 +function M.isNVV(641,20735 +function M.isNVV(isNVV641,20735 +function M.spiderBuilt(645,20786 +function M.spiderBuilt(spiderBuilt645,20786 +function M.locationT(649,20849 +function M.locationT(locationT649,20849 +function M.defaultT(659,21065 +function M.defaultT(defaultT659,21065 +function M.singleton(671,21331 +function M.singleton(singleton671,21331 +function M.__clear(697,22070 +function M.__clear(__clear697,22070 logos/2x/Lmod-black@2x.png,110 NKKvڵcO{C~}Ji(e8FB=_X4$ɡ9 }h<`AxZ߄fdtVzAxZ߄fdtV5,2308 @@ -1579,43 +1583,43 @@ init/R,23 init/zsh/_module,443 _module(4,35 -_module_command(36,2351 -_module_loaded_modules(95,4295 -_module_available_modules(101,4471 -_module_spider_list(109,4697 -_module_restore(114,4798 -_module_disable(120,4935 -_ml_mcc(126,5072 -_ml_describe(132,5201 -_module_help(139,5366 -_module_load(146,5489 -_module_spider(153,5610 -_module_unload(160,5724 -_module_swap(167,5846 -_module_show(181,6139 -_module_use(191,6315 -_module_unuse(199,6495 -_module_whatis(205,6587 +_module_command(39,2628 +_module_loaded_modules(98,4572 +_module_available_modules(104,4748 +_module_spider_list(112,4974 +_module_restore(117,5075 +_module_disable(123,5212 +_ml_mcc(129,5349 +_ml_describe(135,5478 +_module_help(142,5643 +_module_load(149,5766 +_module_spider(156,5887 +_module_unload(163,6001 +_module_swap(170,6123 +_module_show(184,6416 +_module_use(194,6592 +_module_unuse(202,6772 +_module_whatis(208,6864 init/zsh/_ml,396 _ml(4,31 -_ml_loaded_modules_negated(164,5561 -_ml_loaded_modules(169,5722 -_ml_available_modules(177,5897 -_ml_spider_list(185,6120 -_ml_unload(191,6218 -_ml_restore(197,6294 -_ml_mcc(203,6427 -_ml_describe(209,6556 -_ml_disable(215,6690 -_ml_help(221,6823 -_ml_swap(227,6903 -_ml_show(239,7146 -_ml_load(246,7257 -_ml_use(253,7367 -_ml_unuse(261,7543 -_ml_whatis(267,7631 -_ml_spider(273,7713 +_ml_loaded_modules_negated(167,5725 +_ml_loaded_modules(172,5886 +_ml_available_modules(180,6061 +_ml_spider_list(188,6284 +_ml_unload(194,6382 +_ml_restore(200,6458 +_ml_mcc(206,6591 +_ml_describe(212,6720 +_ml_disable(218,6854 +_ml_help(224,6987 +_ml_swap(230,7067 +_ml_show(242,7310 +_ml_load(249,7421 +_ml_use(256,7531 +_ml_unuse(264,7707 +_ml_whatis(270,7795 +_ml_spider(276,7877 init/profile.in,345 LMOD_ALLOW_ROOT_USE=7,262 @@ -1686,25 +1690,26 @@ init/ksh_funcs/ml,13 init/ksh_funcs/clearMT,18 clearMT(6,202 -init/bash.in,410 +init/bash.in,484 *v*x*) __lmod_vx=10,259 *v*) __lmod_vx=11,289 *x*) __lmod_vx=12,319 esac;13,349 -SUPPORT_KSH=26,681 - zv=29,809 - orig_zsh_version=30,833 - module(87,2865 - module(94,3072 -LMOD_VERSION=128,4115 - settarg 132,4211 -ml(148,4692 -clearMT(163,5038 -clearLmod(168,5109 -xSetTitleLmod(174,5208 - set -$__lmod_vx;$__lmod_vx190,5682 - unset __lmod_vx;191,5701 -fi;192,5720 +__build_FPATH_for_zsh_ksh(26,681 + export __LMOD_SET_ZSH_FPATH=34,944 + export FPATH=44,1214 + export __LMOD_SET_KSH_FPATH=46,1312 + module(97,3060 + module(104,3267 +LMOD_VERSION=138,4310 + settarg 142,4406 +ml(158,4887 +clearMT(173,5233 +clearLmod(178,5304 +xSetTitleLmod(184,5403 + set -$__lmod_vx;$__lmod_vx200,5877 + unset __lmod_vx;201,5896 +fi;202,5915 init/sh.in,43 LMOD_ROOT=3,11 @@ -1727,7 +1732,7 @@ _module_describe(90,2574 _module_not_yet_loaded(94,2669 _module_long_arg_list(98,2765 _module(118,3302 -_ml(185,5289 +_ml(185,5337 init/lisp,578 ;; call-process on Emacs cannot write stderr to a separate buffer35,1322 @@ -1988,75 +1993,77 @@ files[files24,1579 build.rtm,440 PKG_VERSION=3,35 -save_old_version(26,823 -make_symlink(38,1136 -runMe(48,1442 -BUILD_TYPE=78,1927 - BUILD_TYPE=80,1974 -myhost=89,2143 -first=90,2167 -SYSHOST=91,2187 -SUDO=92,2208 - MY_ARCH=95,2255 - MAKE_EXTRA=107,2479 - EXTRA=127,3197 - SUDO=132,3310 - base=143,3659 - UPDATE_FN=148,3829 - base=156,4072 - base=158,4137 - ADMIN_DIR=170,4465 -BASE_DIR=178,4715 - EXTRA_CMD=181,4759 - MAKE=192,4938 - -configure.ac,1217 +save_old_version(30,886 +make_symlink(42,1199 +runMe(52,1505 +BUILD_TYPE=82,1990 + BUILD_TYPE=84,2037 +myhost=93,2206 +first=94,2230 +SYSHOST=95,2250 +SUDO=96,2271 + MY_ARCH=99,2318 + MAKE_EXTRA=111,2542 + EXTRA=131,3238 + SUDO=136,3351 + base=147,3707 + UPDATE_FN=152,3877 + base=160,4120 + base=162,4185 + ADMIN_DIR=174,4513 +BASE_DIR=182,4763 + EXTRA_CMD=185,4807 + MAKE=196,4986 + +configure.ac,1250 FOLLOW_READLINK 23,294 -AC_SUBST(46,691 - AC_MSG_RESULT(657,26818 - AC_MSG_RESULT(673,27332 - FAST_TCL_INTERP=696,28097 - OS=700,28162 - DIR=702,28213 - TCL_INCLUDE=707,28396 - AC_PATH_PROG(714,28504 - TCL_INCLUDE=719,28723 - AC_MSG_ERROR(734,29170 - mode=766,30122 -AC_PATH_PROG(779,30407 -AC_PATH_PROG(788,30575 -AC_PATH_PROGS(797,30773 -AC_PATH_PROGS(806,30973 -AC_PATH_PROGS(815,31207 -AC_PATH_PROG(824,31373 - PATH_TO_HASHSUM=829,31617 -AC_PATH_PROG(838,31842 -AC_PATH_PROGS(846,32072 - PATH_TO_LUA=865,32584 - mismatch=871,32782 - mismatch=874,32886 - AC_PATH_PROG(890,33246 - AC_PATH_PROG(901,33531 - lmodV=912,33960 - LUA_PATH=930,34459 - missingModules=952,35357 - AC_SUBST(969,35693 - missingModules=977,35928 - lfsV=984,36032 - AC_SUBST(989,36216 - missingModules=998,36438 - AC_SUBST(1005,36558 -PATH_TO_LUA_DIR=1016,36695 - LUA_INCLUDE=1021,36764 - AC_PATH_PROG(1025,36846 - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1028,36955 - LUA_INCLUDE=1030,37044 - LUA_INCLUDE=1040,37351 -AC_SUBST(1061,37737 - resultA=1067,37875 - result=1081,38126 - ORIG_ZSH_VERSION=1101,38596 - ZSH_FPATH=1115,38827 +ERR_MSG=45,690 + AC_MSG_RESULT(660,26862 + AC_MSG_RESULT(677,27395 + FAST_TCL_INTERP=700,28160 + OS=704,28225 + DIR=706,28276 + TCL_INCLUDE=711,28459 + AC_PATH_PROG(718,28567 + TCL_INCLUDE=723,28786 + FOUND_ERROR=738,29233 +PATH_TO_SRC=758,29990 + mode=774,30282 +MSG=777,30358 +AC_PATH_PROG(799,30747 +AC_PATH_PROGS(808,30945 +AC_PATH_PROGS(817,31145 +AC_PATH_PROGS(826,31379 +AC_PATH_PROG(835,31545 + PATH_TO_HASHSUM=842,31846 +AC_PATH_PROG(851,32071 +AC_PATH_PROGS(859,32301 + PATH_TO_LUA=878,32813 + mismatch=884,33011 + mismatch=887,33115 + AC_PATH_PROG(903,33475 + AC_PATH_PROG(914,33760 + lmodV=925,34189 + LUA_PATH=943,34688 + missingModules=965,35586 + AC_SUBST(982,35922 + missingModules=990,36157 + lfsV=997,36261 + AC_SUBST(1002,36445 + missingModules=1011,36667 + AC_SUBST(1018,36787 +PATH_TO_LUA_DIR=1029,36924 + LUA_INCLUDE=1034,36993 + AC_PATH_PROG(1038,37075 + PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1041,37184 + LUA_INCLUDE=1043,37273 + LUA_INCLUDE=1053,37580 + exit 1085,38310 +AC_SUBST(1088,38330 + resultA=1094,38468 + result=1108,38719 + ORIG_ZSH_VERSION=1128,39189 + ZSH_FPATH=1142,39420 tools/Optiks_Option.lua,263 function M.optionNames(65,2309 @@ -2182,7 +2189,7 @@ function MF_TCL.header(header95,3400 tools/TermWidth.lua,64 local function l_askSystem(49,1883 -function TermWidth(80,2594 +function TermWidth(74,2477 tools/Cosmic.lua,654 function M.singleton(54,2164 @@ -2362,10 +2369,10 @@ tools/serializeTbl.lua,180 local function l_quoteValue(67,2556 local function l_nsformat(79,2839 local function wrap_name(112,3897 -local function outputTblHelper(129,4394 -function serializeTbl(235,7258 +local function outputTblHelper(129,4393 +function serializeTbl(235,7257 -tools/Optiks.lua,1391 +tools/Optiks.lua,1471 local function l_argsPack(33,1446 function Optiks_Error(42,1780 function Optiks_Exit(52,1983 @@ -2373,38 +2380,40 @@ local function l_prt(81,2671 local function l_prtend(85,2723 function M.new(92,2916 function M.new(new92,2916 -function M.add_option(150,4297 -function M.add_option(add_option150,4297 -function M._getValue(186,5491 -function M._getValue(_getValue186,5491 -function M.store(212,6299 -function M.store(store212,6299 -function M.store_true(225,6810 -function M.store_true(store_true225,6810 -function M.append(238,7328 -function M.append(append238,7328 -function M.store_false(255,7918 -function M.store_false(store_false255,7918 -function M.count(268,8433 -function M.count(count268,8433 -function M.display_store(278,8733 -function M.display_store(display_store278,8733 -function M.display_flag(298,9249 -function M.display_flag(display_flag298,9249 -function M.display_count(311,9603 -function M.display_count(display_count311,9603 -function M.setDefaults(319,9870 -function M.setDefaults(setDefaults319,9870 -function M.parseOpt(334,10412 -function M.parseOpt(parseOpt334,10412 -function M.buildHelpMsg(347,10863 -function M.buildHelpMsg(buildHelpMsg347,10863 -function M.printHelp(370,11474 -function M.printHelp(printHelp370,11474 -function M.parseEnvArg(380,11759 -function M.parseEnvArg(parseEnvArg380,11759 -function M.parse(435,13111 -function M.parse(parse435,13111 +function M.add_option(154,4398 +function M.add_option(add_option154,4398 +function M._getValue(190,5592 +function M._getValue(_getValue190,5592 +function M.store(216,6400 +function M.store(store216,6400 +function M.store_true(229,6911 +function M.store_true(store_true229,6911 +function M.append(242,7429 +function M.append(append242,7429 +function M.store_false(259,8019 +function M.store_false(store_false259,8019 +function M.count(272,8534 +function M.count(count272,8534 +function M.display_store(282,8834 +function M.display_store(display_store282,8834 +function M.display_flag(302,9350 +function M.display_flag(display_flag302,9350 +function M.display_count(315,9704 +function M.display_count(display_count315,9704 +function M.setDefaults(323,9971 +function M.setDefaults(setDefaults323,9971 +function M.parseOpt(338,10513 +function M.parseOpt(parseOpt338,10513 +function M.buildHelpMsg(351,10964 +function M.buildHelpMsg(buildHelpMsg351,10964 +function M.printHelp(374,11588 +function M.printHelp(printHelp374,11588 +function M.buildManPod(379,11669 +function M.buildManPod(buildManPod379,11669 +function M.parseEnvArg(406,12421 +function M.parseEnvArg(parseEnvArg406,12421 +function M.parse(461,13773 +function M.parse(parse461,13773 tools/json.lua,592 function json.encode 67,2820 @@ -2593,7 +2602,7 @@ project 1,0 topics 8,194 format=9,288 -Makefile.in,5373 +Makefile.in,5413 srcdir 1,0 prefix 2,38 SYS_LUA_PATH 3,76 @@ -2640,168 +2649,169 @@ SILENCE_SHELL_DEBUGGING 51,2409 SYS_LD_LIB_PATH 52,2464 SYS_LD_PRELOAD 53,2511 CASE_INDEPENDENT_SORTING 54,2557 -ORIG_ZSH_VERSION 55,2613 -ZSH_SITE_FUNCTIONS_DIRS 56,2661 -ZSH_FPATH 57,2716 -SPIDER_CACHE_DESCRIPT_FN 58,2757 -ANCIENT 59,2813 -ALLOW_TCL_MFILES 60,2852 -MPATH_AVAIL 61,2900 -EXTENDED_DEFAULT 62,2943 -TMOD_PATH_RULE 63,2991 -TMOD_FIND_FIRST 64,3037 -CACHED_LOADS 65,3084 -EXACT_MATCH 66,3128 -DUPLICATE_PATHS 67,3171 -DISABLE_NAME_AUTOSWAP 68,3218 -SHORT_TIME 69,3271 -PIN_VERSIONS 70,3313 -AUTO_SWAP 71,3357 -SPIDER_CACHE_DIRS 72,3398 -LEGACY_ORDERING 73,3447 -EXPORT_MODULE 74,3494 -LMOD_DOWNSTREAM_CONFLICTS 75,3539 -MODULES_AUTO_HANDLING 76,3596 -BASENAME 77,3649 -UPDATE_VERSION 78,3689 -BUILD_V_src 79,3816 -PS 80,3975 -READLINK 81,4009 -EXPR 82,4049 -MODULES_AUTO_HANDLING 83,4085 -PATH_TO_HASHSUM 84,4138 -PATH_TO_LUAC 85,4185 -PATH_TO_PAGER 86,4229 -PATH_TO_TCLSH 87,4274 -PATH_TO_LS 88,4319 -MODULEPATH_ROOT 89,4361 -VDateFn 90,4408 -VERSION_SRC 91,4460 -SETTARG_VSRC 92,4515 -LUA_INCLUDE 93,4574 -UPDATE_SYSTEM_FN 94,4617 -GIT_PROG 95,4665 -PKG 96,4708 -PKGV 97,4755 -LIB 98,4798 -LIBEXEC 99,4845 -SHELLS 100,4896 -TOOLS 101,4946 -I18N 102,4995 -SETTARG 103,5049 -INIT 104,5100 -INIT_KSH_FUNCS 105,5148 -FISH_TAB 106,5206 -MESSAGEDIR 107,5274 -LMOD_MF 108,5328 -MAN_PAGES 109,5388 -LMOD_MF_SOURCE 110,5446 -SETTARG_SOURCE 111,5520 -DATE_cmd 112,5608 -UNAME_S 113,5669 -VersionDate 114,5716 -MODE 115,5769 - SED 118,5831 - SED 120,5855 -MODE_X 123,5880 -MODE_R 124,5946 - LUA_INCLUDE 128,6039 - LUA_INCLUDE 130,6062 - GIT_VERSION 133,6126 - GIT_BRANCH 137,6319 -DIRLIST 141,6540 -STANDALONE_PRGM 146,6955 -STANDALONE_PRGM 154,7609 -SHELL_INIT 155,7685 -SHELL_INIT 158,7922 -LMODRC_INIT 159,7998 -ZSH_FUNCS 162,8073 -ZSH_FUNCS 163,8114 -FISH_FUNCS 165,8194 -FISH_FUNCS 166,8238 -KSH_FUNCS 168,8320 -KSH_FUNCS 169,8385 -STARTUP 171,8471 -STARTUP 172,8550 -MSGFNs 174,8624 -MAIN_DIR 176,8693 -CONTRIB_DIRS 179,8837 -CONTRIB 192,9579 -lua_code 193,9660 -lua_code 194,9745 -CurDATE 195,9859 -ComputeHashSum 197,9926 -spiderCacheSupportCMD 198,9991 -export L_PATH export L_PATH199,10075 -export L_CPATH export L_CPATH200,10117 -HAVE_LUA_TERM 202,10161 - PKGS 204,10235 -HAVE_LUAFILESYSTEM 206,10256 - PKGS 208,10340 - PKG_LFS 209,10362 -FAST_TCL_INTERP 211,10385 -TCL_INCLUDE 212,10432 -TCL_LIBS 213,10468 - PKGS 215,10531 - PKG_T2L 216,10560 -.PHONY:.PHONY219,10588 -all:all221,10617 -uninstall:uninstall224,10635 -pre-install:pre-install228,10757 -lmod_install_targets:lmod_install_targets230,10803 -install:install235,11094 -echo:echo250,12039 -man_pages:man_pages255,12142 - LUA_PATH=257,12253 -$(DIRLIST)$(DIRLIST261,12486 -__installMe:__installMe264,12528 -generate_doc:generate_doc353,19363 -shell_init:shell_init356,19386 -lmodrc_init:lmodrc_init359,19500 -messageFns:messageFns362,19618 -i18n:i18n365,19734 -startup:startup368,19840 -other_tools:other_tools371,19950 -spiderCacheSupport:spiderCacheSupport374,20091 -src/computeHashSum:src/computeHashSum381,20489 -tcl2lua:tcl2lua385,20634 - $(MAKE) -C $(srcdir)/pkgs/tcl2lua LUA_INC=$(MAKE) -C $(srcdir)/pkgs/tcl2lua LUA_INC387,20713 - LIB=389,20860 - SHARE=390,20937 -lfs:lfs394,21103 - $(MAKE) -C $(srcdir)/pkgs/luafilesystem LUA_INC=$(MAKE) -C $(srcdir)/pkgs/luafilesystem LUA_INC396,21178 - LIB=397,21255 - MODE_R=398,21332 -pkgs:pkgs401,21497 - $(MAKE) -C $(srcdir)/pkgs LUA_INC=$(MAKE) -C $(srcdir)/pkgs LUA_INC403,21573 - LIB=404,21650 - MODE_R=405,21727 -zsh_tab_funcs:zsh_tab_funcs409,21893 -ksh_funcs:ksh_funcs424,22798 -fish_tab_funcs:fish_tab_funcs427,22920 -makefile:makefile430,23010 -config.status:config.status433,23079 -trailing_blanks_removed:trailing_blanks_removed436,23122 -dist:dist439,23267 -ml_dist:ml_dist459,24688 -_ml_dist:_ml_dist462,24727 -test:test471,25173 -tags:tags474,25211 -build_tags:build_tags477,25248 -busted:busted541,28879 -luachk:luachk548,29234 -libexec:libexec552,29393 -VersionSrc:VersionSrc555,29506 -STVersionSrc:STVersionSrc558,29648 -Inst_Tools:Inst_Tools561,29804 -Inst_Shells:Inst_Shells564,29917 -Inst_Settarg:Inst_Settarg567,30043 -Inst_Lmod_MF:Inst_Lmod_MF571,30167 -clean:clean574,30290 -clobber:clobber580,30534 -distclean:distclean582,30550 -world_update:world_update585,30600 -gittag:gittag611,32542 +ZSH_SITE_FUNCTIONS_DIRS 55,2613 +SPIDER_CACHE_DESCRIPT_FN 56,2668 +ANCIENT 57,2724 +ALLOW_TCL_MFILES 58,2763 +MPATH_AVAIL 59,2811 +EXTENDED_DEFAULT 60,2854 +TMOD_PATH_RULE 61,2902 +TMOD_FIND_FIRST 62,2948 +CACHED_LOADS 63,2995 +EXACT_MATCH 64,3039 +DUPLICATE_PATHS 65,3082 +DISABLE_NAME_AUTOSWAP 66,3129 +SHORT_TIME 67,3182 +PIN_VERSIONS 68,3224 +AUTO_SWAP 69,3268 +SPIDER_CACHE_DIRS 70,3309 +LEGACY_ORDERING 71,3358 +EXPORT_MODULE 72,3405 +LMOD_DOWNSTREAM_CONFLICTS 73,3450 +MODULES_AUTO_HANDLING 74,3507 +BASENAME 75,3560 +UPDATE_VERSION 76,3600 +BUILD_V_src 77,3727 +PS 78,3886 +READLINK 79,3920 +EXPR 80,3960 +MODULES_AUTO_HANDLING 81,3996 +PATH_TO_POD2MAN 82,4049 +PATH_TO_HASHSUM 83,4096 +PATH_TO_LUAC 84,4143 +PATH_TO_PAGER 85,4187 +PATH_TO_TCLSH 86,4232 +PATH_TO_LS 87,4277 +MODULEPATH_ROOT 88,4319 +VDateFn 89,4366 +VERSION_SRC 90,4418 +SETTARG_VSRC 91,4473 +LUA_INCLUDE 92,4532 +UPDATE_SYSTEM_FN 93,4575 +GIT_PROG 94,4623 +PKG 95,4666 +PKGV 96,4713 +LIB 97,4756 +LIBEXEC 98,4803 +SHELLS 99,4854 +TOOLS 100,4904 +I18N 101,4953 +SETTARG 102,5007 +INIT 103,5058 +INIT_KSH_FUNCS 104,5106 +FISH_TAB 105,5164 +MESSAGEDIR 106,5232 +LMOD_MF 107,5286 +MAN_PAGES_CAT 108,5346 +MAN_PAGES 109,5404 +LMOD_MF_SOURCE 110,5462 +SETTARG_SOURCE 111,5536 +DATE_cmd 112,5624 +UNAME_S 113,5685 +VersionDate 114,5732 +MODE 115,5785 + SED 118,5847 + SED 120,5871 +MODE_X 123,5896 +MODE_R 124,5962 + LUA_INCLUDE 128,6055 + LUA_INCLUDE 130,6078 + GIT_VERSION 133,6142 + GIT_BRANCH 137,6335 +DIRLIST 141,6556 +STANDALONE_PRGM 147,7042 +STANDALONE_PRGM 155,7696 +SHELL_INIT 156,7772 +SHELL_INIT 159,8009 +LMODRC_INIT 160,8085 +ZSH_FUNCS 163,8160 +ZSH_FUNCS 164,8201 +FISH_FUNCS 166,8281 +FISH_FUNCS 167,8325 +KSH_FUNCS 169,8407 +KSH_FUNCS 170,8472 +STARTUP 172,8558 +STARTUP 173,8637 +MSGFNs 175,8711 +MAIN_DIR 177,8780 +CONTRIB_DIRS 180,8924 +CONTRIB 193,9666 +lua_code 194,9747 +lua_code 195,9832 +CurDATE 196,9946 +ComputeHashSum 198,10013 +spiderCacheSupportCMD 199,10078 +export L_PATH export L_PATH200,10162 +export L_CPATH export L_CPATH201,10204 +HAVE_LUA_TERM 203,10248 + PKGS 205,10322 +HAVE_LUAFILESYSTEM 207,10343 + PKGS 209,10427 + PKG_LFS 210,10449 +FAST_TCL_INTERP 212,10472 +TCL_INCLUDE 213,10519 +TCL_LIBS 214,10555 + PKGS 216,10618 + PKG_T2L 217,10647 +.PHONY:.PHONY220,10675 +all:all222,10704 +uninstall:uninstall225,10722 +pre-install:pre-install229,10844 +lmod_install_targets:lmod_install_targets231,10890 +install:install236,11181 +echo:echo251,12126 +man_pages:man_pages256,12229 + LUA_PATH=259,12419 + LUA_PATH=264,12757 +$(DIRLIST)$(DIRLIST271,13148 +__installMe:__installMe274,13190 +generate_doc:generate_doc361,19867 +shell_init:shell_init364,19890 +lmodrc_init:lmodrc_init367,20004 +messageFns:messageFns370,20122 +i18n:i18n373,20238 +startup:startup376,20344 +other_tools:other_tools379,20454 +spiderCacheSupport:spiderCacheSupport382,20595 +src/computeHashSum:src/computeHashSum389,20993 +tcl2lua:tcl2lua393,21138 + $(MAKE) -C $(srcdir)/pkgs/tcl2lua LUA_INC=$(MAKE) -C $(srcdir)/pkgs/tcl2lua LUA_INC395,21217 + LIB=397,21364 + SHARE=398,21441 +lfs:lfs402,21607 + $(MAKE) -C $(srcdir)/pkgs/luafilesystem LUA_INC=$(MAKE) -C $(srcdir)/pkgs/luafilesystem LUA_INC404,21682 + LIB=405,21759 + MODE_R=406,21836 +pkgs:pkgs409,22001 + $(MAKE) -C $(srcdir)/pkgs LUA_INC=$(MAKE) -C $(srcdir)/pkgs LUA_INC411,22077 + LIB=412,22154 + MODE_R=413,22231 +zsh_tab_funcs:zsh_tab_funcs417,22397 +ksh_funcs:ksh_funcs432,23302 +fish_tab_funcs:fish_tab_funcs435,23424 +makefile:makefile438,23514 +config.status:config.status441,23583 +trailing_blanks_removed:trailing_blanks_removed444,23626 +dist:dist447,23771 +ml_dist:ml_dist467,25192 +_ml_dist:_ml_dist470,25231 +test:test479,25677 +tags:tags482,25715 +build_tags:build_tags485,25752 +busted:busted549,29383 +luachk:luachk556,29738 +libexec:libexec560,29897 +VersionSrc:VersionSrc563,30010 +STVersionSrc:STVersionSrc566,30152 +Inst_Tools:Inst_Tools569,30308 +Inst_Shells:Inst_Shells572,30421 +Inst_Settarg:Inst_Settarg575,30547 +Inst_Lmod_MF:Inst_Lmod_MF579,30671 +clean:clean582,30794 +clobber:clobber588,31038 +distclean:distclean590,31054 +world_update:world_update593,31104 +gittag:gittag619,33046 tcl/tacc/TACC,34 set MODULEPATH_ROOT env(49,1350 diff --git a/TAGS.world b/TAGS.world index 8389c5a47..cb4351fa5 100644 --- a/TAGS.world +++ b/TAGS.world @@ -12,15 +12,8 @@ RmapDir=127,2984 XSEDE_dir=153,3853 timeStamp=157,3951 -contrib/TACC/CollectModuleData4Web.sh,163 -cmd=7,125 - dir=10,178 - ARCH=18,389 - LMOD_DIR=40,972 -DIRLIST=48,1140 - LUATOOLS=58,1472 -export LUA_PATH=63,1521 - BASE_MODULE_PATH=70,1756 +contrib/TACC/CollectModuleData4Web.sh,19 +SCRIPT_NAME=7,170 contrib/TACC/checkModuleSyntax,68 usage(6,87 @@ -475,7 +468,7 @@ function M.apply(apply123,5606 function M.exists(133,5813 function M.exists(exists133,5813 -src/Spider.lua,2153 +src/Spider.lua,2194 function M.new(69,2677 function M.new(new69,2677 local function l_nothing(77,2802 @@ -483,54 +476,55 @@ local function l_process(80,2834 function processLPATH(94,3221 function processPATH(98,3284 function processDIR(102,3345 -local function l_processNewModulePATH(106,3404 -function Spider_dynamic_mpath(131,4202 -function Spider_append_path(139,4436 -local function l_loadMe(168,5310 -local function l_findModules(189,6130 -local function l_findChangeMPATH_modules(212,7032 -function M.searchSpiderDB(236,7891 -function M.searchSpiderDB(searchSpiderDB236,7891 -function M.findAllModules(295,9435 -function M.findAllModules(findAllModules295,9435 -function extend(408,12821 -function reverse(416,12944 -function copy(425,13071 -local function l_build_parentT(482,15217 - local function l_build_parentT_helper(487,15383 -local function l_build_mpathParentT(536,16808 -local function l_search_mpathParentT(566,17616 -local function l_build_keepT(582,17962 -function M.buildDbT(603,18519 -function M.buildDbT(buildDbT603,18519 - local function l_cmp(623,19219 - local function l_buildDbT_helper(626,19280 -function M.buildProvideByT(697,21478 -function M.buildProvideByT(buildProvideByT697,21478 - local function l_cmp(730,22847 -function M.Level0_terse(751,23254 -function M.Level0_terse(Level0_terse751,23254 -function M.Level0(789,24329 -function M.Level0(Level0789,24329 -local function l_case_independent_cmp_by_name(815,24956 -function M.Level0Helper(826,25170 -function M.Level0Helper(Level0Helper826,25170 -function M.setExactMatch(905,27693 -function M.setExactMatch(setExactMatch905,27693 -function M.getExactMatch(909,27758 -function M.getExactMatch(getExactMatch909,27758 -function M.spiderSearch(913,27816 -function M.spiderSearch(spiderSearch913,27816 -function M._Level1(1071,32590 -function M._Level1(_Level11071,32590 - local function l_countEntries(1088,33184 - local function cmp(1124,34172 -function M._Level2(1329,40291 -function M._Level2(_Level21329,40291 -function M.listModules(1513,45714 -function M.listModules(listModules1513,45714 -function M.dictModules(1524,45896 -function M.dictModules(dictModules1524,45896 +local function l_isActiveMfile(106,3404 +local function l_processNewModulePATH(112,3572 +function Spider_dynamic_mpath(137,4370 +function Spider_append_path(145,4604 +local function l_loadMe(174,5478 +local function l_findModules(195,6298 +local function l_findChangeMPATH_modules(218,7200 +function M.searchSpiderDB(242,8059 +function M.searchSpiderDB(searchSpiderDB242,8059 +function M.findAllModules(301,9603 +function M.findAllModules(findAllModules301,9603 +function extend(414,12989 +function reverse(422,13112 +function copy(431,13239 +local function l_build_parentT(488,15385 + local function l_build_parentT_helper(493,15551 +local function l_build_mpathParentT(542,16976 +local function l_search_mpathParentT(572,17784 +local function l_build_keepT(588,18130 +function M.buildDbT(609,18687 +function M.buildDbT(buildDbT609,18687 + local function l_cmp(629,19387 + local function l_buildDbT_helper(632,19448 +function M.buildProvideByT(703,21646 +function M.buildProvideByT(buildProvideByT703,21646 + local function l_cmp(736,23015 +function M.Level0_terse(757,23422 +function M.Level0_terse(Level0_terse757,23422 +function M.Level0(795,24499 +function M.Level0(Level0795,24499 +local function l_case_independent_cmp_by_name(821,25126 +function M.Level0Helper(832,25340 +function M.Level0Helper(Level0Helper832,25340 +function M.setExactMatch(911,27865 +function M.setExactMatch(setExactMatch911,27865 +function M.getExactMatch(915,27930 +function M.getExactMatch(getExactMatch915,27930 +function M.spiderSearch(919,27988 +function M.spiderSearch(spiderSearch919,27988 +function M._Level1(1077,32762 +function M._Level1(_Level11077,32762 + local function l_countEntries(1094,33356 + local function cmp(1130,34344 +function M._Level2(1335,40465 +function M._Level2(_Level21335,40465 +function M.listModules(1519,45888 +function M.listModules(listModules1519,45888 +function M.dictModules(1530,46070 +function M.dictModules(dictModules1530,46070 src/MN_Latest.lua,174 function M.show(49,2034 @@ -639,165 +633,165 @@ function M.isEmpty(301,10425 function M.isEmpty(isEmpty301,10425 function M.setenv(315,10946 function M.setenv(setenv315,10946 -function M.setenv_env(345,11782 -function M.setenv_env(setenv_env345,11782 -function M.unsetenv(360,12336 -function M.unsetenv(unsetenv360,12336 -function M.pushenv(396,13472 -function M.pushenv(pushenv396,13472 -function M.popenv(452,15104 -function M.popenv(popenv452,15104 -function M.prepend_path(495,16303 -function M.prepend_path(prepend_path495,16303 -function M.append_path(528,17347 -function M.append_path(append_path528,17347 -function M.remove_path(559,18390 -function M.remove_path(remove_path559,18390 -function M.remove_path_first(594,19590 -function M.remove_path_first(remove_path_first594,19590 -function M.remove_path_last(603,19882 -function M.remove_path_last(remove_path_last603,19882 -function M.set_alias(616,20271 -function M.set_alias(set_alias616,20271 -function M.unset_alias(638,20904 -function M.unset_alias(unset_alias638,20904 -function M.set_shell_function(658,21515 -function M.set_shell_function(set_shell_function658,21515 -function M.unset_shell_function(681,22312 -function M.unset_shell_function(unset_shell_function681,22312 -function M.mode(700,22947 -function M.mode(mode700,22947 -function M.execute(708,23240 -function M.execute(execute708,23240 -function M.myShellName(727,23756 -function M.myShellName(myShellName727,23756 -function M.myShellType(731,23833 -function M.myShellType(myShellType731,23833 -function M.myFileName(740,24078 -function M.myFileName(myFileName740,24078 -function M.myModuleFullName(748,24360 -function M.myModuleFullName(myModuleFullName748,24360 -function M.myModuleUsrName(757,24725 -function M.myModuleUsrName(myModuleUsrName757,24725 -function M.myModuleName(766,25030 -function M.myModuleName(myModuleName766,25030 -function M.myModuleVersion(775,25349 -function M.myModuleVersion(myModuleVersion775,25349 -local function l_generateMsg(780,25457 -function M.msg_raw(799,26027 -function M.msg_raw(msg_raw799,26027 -function M.message(813,26330 -function M.message(message813,26330 -function M.warning(836,27045 -function M.warning(warning836,27045 -function M.error(851,27562 -function M.error(error851,27562 -function M.quiet(884,28448 -function M.quiet(quiet884,28448 -function M.mustLoad(888,28502 -function M.mustLoad(mustLoad888,28502 -function M.registerDependencyCk(898,28709 -function M.registerDependencyCk(registerDependencyCk898,28709 -function M.performDependencyCk(902,28777 -function M.performDependencyCk(performDependencyCk902,28777 -function M.dependencyCk(912,29050 -function M.dependencyCk(dependencyCk912,29050 -function M.dependencyCk_any(934,29601 -function M.dependencyCk_any(dependencyCk_any934,29601 -function M.reportMissingDepModules(966,30437 -function M.reportMissingDepModules(reportMissingDepModules966,30437 -function M.depends_on(988,31085 -function M.depends_on(depends_on988,31085 -function M.depends_on_any(1027,32021 -function M.depends_on_any(depends_on_any1027,32021 -function M.forgo(1073,33258 -function M.forgo(forgo1073,33258 -function M.forgo_any(1104,34114 -function M.forgo_any(forgo_any1104,34114 -function M.load_usr(1152,35589 -function M.load_usr(load_usr1152,35589 -function mAList(1174,36214 -function M.load(1182,36347 -function M.load(load1182,36347 -function M.load_any(1199,36661 -function M.load_any(load_any1199,36661 -function M.mgrload(1229,37237 -function M.mgrload(mgrload1229,37237 -function M.mgr_unload(1246,37605 -function M.mgr_unload(mgr_unload1246,37605 -function M.try_load(1261,38101 -function M.try_load(try_load1261,38101 -function M.unload(1272,38431 -function M.unload(unload1272,38431 -function M.build_unload(1287,38719 -function M.build_unload(build_unload1287,38719 -function M.do_not_build_unload(1293,38877 -function M.do_not_build_unload(do_not_build_unload1293,38877 -function M.unload_usr(1304,39214 -function M.unload_usr(unload_usr1304,39214 -function M.fake_load(1323,39716 -function M.fake_load(fake_load1323,39716 -function M.conflict(1335,40093 -function M.conflict(conflict1335,40093 -function M.removeConflict(1369,41051 -function M.removeConflict(removeConflict1369,41051 -function M.prereq(1386,41601 -function M.prereq(prereq1386,41601 -function M.prereq_any(1413,42349 -function M.prereq_any(prereq_any1413,42349 -function M.familyStackPush(1444,43226 -function M.familyStackPush(familyStackPush1444,43226 -function M.familyStackTop(1461,43922 -function M.familyStackTop(familyStackTop1461,43922 -function M.familyStackPop(1471,44229 -function M.familyStackPop(familyStackPop1471,44229 -function M.processFamilyStack(1482,44564 -function M.processFamilyStack(processFamilyStack1482,44564 -function M.familyStackEmpty(1492,44873 -function M.familyStackEmpty(familyStackEmpty1492,44873 -function M.family(1501,45184 -function M.family(family1501,45184 -function M.unset_family(1529,46118 -function M.unset_family(unset_family1529,46118 -function M.registerAdminMsg(1536,46314 -function M.registerAdminMsg(registerAdminMsg1536,46314 -function M.reportAdminMsgs(1573,47434 -function M.reportAdminMsgs(reportAdminMsgs1573,47434 -function M.loaded_modules(1603,48474 -function M.loaded_modules(loaded_modules1603,48474 -function M.add_property(1618,48942 -function M.add_property(add_property1618,48942 -function M.remove_property(1632,49396 -function M.remove_property(remove_property1632,49396 -function purgeFlg(1641,49656 -function M.purge(1646,49703 -function M.purge(purge1646,49703 -function M.tcl_mode(1677,50367 -function M.tcl_mode(tcl_mode1677,50367 -function M.is_spider(1684,50603 -function M.is_spider(is_spider1684,50603 -function M.inherit(1695,51029 -function M.inherit(inherit1695,51029 -function M.source_sh(1702,51186 -function M.source_sh(source_sh1702,51186 -function M.un_source_sh(1727,52055 -function M.un_source_sh(un_source_sh1727,52055 -function M.complete(1742,52664 -function M.complete(complete1742,52664 -function M.uncomplete(1758,53131 -function M.uncomplete(uncomplete1758,53131 -function M.color_banner(1776,53601 -function M.color_banner(color_banner1776,53601 -function M.set_errorFunc(1786,53829 -function M.set_errorFunc(set_errorFunc1786,53829 -function M.LmodBreak(1791,53939 -function M.LmodBreak(LmodBreak1791,53939 -function M.userInGroups(1825,54922 -function M.userInGroups(userInGroups1825,54922 -function M.missing_module(1844,55345 -function M.missing_module(missing_module1844,55345 -function M.haveDynamicMPATH(1848,55442 -function M.haveDynamicMPATH(haveDynamicMPATH1848,55442 +function M.setenv_env(345,11790 +function M.setenv_env(setenv_env345,11790 +function M.unsetenv(360,12344 +function M.unsetenv(unsetenv360,12344 +function M.pushenv(396,13480 +function M.pushenv(pushenv396,13480 +function M.popenv(452,15120 +function M.popenv(popenv452,15120 +function M.prepend_path(495,16327 +function M.prepend_path(prepend_path495,16327 +function M.append_path(528,17371 +function M.append_path(append_path528,17371 +function M.remove_path(559,18414 +function M.remove_path(remove_path559,18414 +function M.remove_path_first(594,19614 +function M.remove_path_first(remove_path_first594,19614 +function M.remove_path_last(603,19906 +function M.remove_path_last(remove_path_last603,19906 +function M.set_alias(616,20295 +function M.set_alias(set_alias616,20295 +function M.unset_alias(638,20936 +function M.unset_alias(unset_alias638,20936 +function M.set_shell_function(658,21555 +function M.set_shell_function(set_shell_function658,21555 +function M.unset_shell_function(681,22360 +function M.unset_shell_function(unset_shell_function681,22360 +function M.mode(700,23003 +function M.mode(mode700,23003 +function M.execute(708,23296 +function M.execute(execute708,23296 +function M.myShellName(727,23812 +function M.myShellName(myShellName727,23812 +function M.myShellType(731,23889 +function M.myShellType(myShellType731,23889 +function M.myFileName(740,24134 +function M.myFileName(myFileName740,24134 +function M.myModuleFullName(748,24416 +function M.myModuleFullName(myModuleFullName748,24416 +function M.myModuleUsrName(757,24781 +function M.myModuleUsrName(myModuleUsrName757,24781 +function M.myModuleName(766,25086 +function M.myModuleName(myModuleName766,25086 +function M.myModuleVersion(775,25405 +function M.myModuleVersion(myModuleVersion775,25405 +local function l_generateMsg(780,25513 +function M.msg_raw(799,26083 +function M.msg_raw(msg_raw799,26083 +function M.message(813,26386 +function M.message(message813,26386 +function M.warning(836,27101 +function M.warning(warning836,27101 +function M.error(851,27618 +function M.error(error851,27618 +function M.quiet(884,28504 +function M.quiet(quiet884,28504 +function M.mustLoad(888,28558 +function M.mustLoad(mustLoad888,28558 +function M.registerDependencyCk(898,28765 +function M.registerDependencyCk(registerDependencyCk898,28765 +function M.performDependencyCk(902,28833 +function M.performDependencyCk(performDependencyCk902,28833 +function M.dependencyCk(912,29106 +function M.dependencyCk(dependencyCk912,29106 +function M.dependencyCk_any(934,29657 +function M.dependencyCk_any(dependencyCk_any934,29657 +function M.reportMissingDepModules(966,30493 +function M.reportMissingDepModules(reportMissingDepModules966,30493 +function M.depends_on(988,31141 +function M.depends_on(depends_on988,31141 +function M.depends_on_any(1027,32077 +function M.depends_on_any(depends_on_any1027,32077 +function M.forgo(1073,33314 +function M.forgo(forgo1073,33314 +function M.forgo_any(1104,34170 +function M.forgo_any(forgo_any1104,34170 +function M.load_usr(1152,35645 +function M.load_usr(load_usr1152,35645 +function mAList(1174,36270 +function M.load(1182,36403 +function M.load(load1182,36403 +function M.load_any(1199,36717 +function M.load_any(load_any1199,36717 +function M.mgrload(1229,37293 +function M.mgrload(mgrload1229,37293 +function M.mgr_unload(1246,37661 +function M.mgr_unload(mgr_unload1246,37661 +function M.try_load(1261,38157 +function M.try_load(try_load1261,38157 +function M.unload(1272,38487 +function M.unload(unload1272,38487 +function M.build_unload(1287,38775 +function M.build_unload(build_unload1287,38775 +function M.do_not_build_unload(1293,38933 +function M.do_not_build_unload(do_not_build_unload1293,38933 +function M.unload_usr(1304,39270 +function M.unload_usr(unload_usr1304,39270 +function M.fake_load(1323,39772 +function M.fake_load(fake_load1323,39772 +function M.conflict(1335,40149 +function M.conflict(conflict1335,40149 +function M.removeConflict(1369,41107 +function M.removeConflict(removeConflict1369,41107 +function M.prereq(1386,41657 +function M.prereq(prereq1386,41657 +function M.prereq_any(1413,42405 +function M.prereq_any(prereq_any1413,42405 +function M.familyStackPush(1444,43282 +function M.familyStackPush(familyStackPush1444,43282 +function M.familyStackTop(1461,43978 +function M.familyStackTop(familyStackTop1461,43978 +function M.familyStackPop(1471,44285 +function M.familyStackPop(familyStackPop1471,44285 +function M.processFamilyStack(1482,44620 +function M.processFamilyStack(processFamilyStack1482,44620 +function M.familyStackEmpty(1492,44929 +function M.familyStackEmpty(familyStackEmpty1492,44929 +function M.family(1501,45240 +function M.family(family1501,45240 +function M.unset_family(1529,46174 +function M.unset_family(unset_family1529,46174 +function M.registerAdminMsg(1536,46370 +function M.registerAdminMsg(registerAdminMsg1536,46370 +function M.reportAdminMsgs(1573,47490 +function M.reportAdminMsgs(reportAdminMsgs1573,47490 +function M.loaded_modules(1603,48530 +function M.loaded_modules(loaded_modules1603,48530 +function M.add_property(1618,48998 +function M.add_property(add_property1618,48998 +function M.remove_property(1632,49460 +function M.remove_property(remove_property1632,49460 +function purgeFlg(1641,49728 +function M.purge(1646,49775 +function M.purge(purge1646,49775 +function M.tcl_mode(1677,50439 +function M.tcl_mode(tcl_mode1677,50439 +function M.is_spider(1684,50675 +function M.is_spider(is_spider1684,50675 +function M.inherit(1695,51101 +function M.inherit(inherit1695,51101 +function M.source_sh(1702,51258 +function M.source_sh(source_sh1702,51258 +function M.un_source_sh(1727,52127 +function M.un_source_sh(un_source_sh1727,52127 +function M.complete(1742,52736 +function M.complete(complete1742,52736 +function M.uncomplete(1758,53203 +function M.uncomplete(uncomplete1758,53203 +function M.color_banner(1776,53673 +function M.color_banner(color_banner1776,53673 +function M.set_errorFunc(1786,53901 +function M.set_errorFunc(set_errorFunc1786,53901 +function M.LmodBreak(1791,54011 +function M.LmodBreak(LmodBreak1791,54011 +function M.userInGroups(1825,54994 +function M.userInGroups(userInGroups1825,54994 +function M.missing_module(1844,55417 +function M.missing_module(missing_module1844,55417 +function M.haveDynamicMPATH(1848,55514 +function M.haveDynamicMPATH(haveDynamicMPATH1848,55514 src/CTimer.lua,212 local function l_new(47,1925 @@ -811,7 +805,7 @@ function M.done(done101,3595 src/mrc_load.lua,27 function mrc_load(44,1894 -src/MT.lua,5877 +src/MT.lua,6038 function M.name(77,2958 function M.name(name77,2958 local function l_mt_version(81,3002 @@ -833,170 +827,174 @@ function M.set_MPATH_change_flag(335,10084 function M.set_MPATH_change_flag(set_MPATH_change_flag335,10084 function M.reset_MPATH_change_flag(340,10206 function M.reset_MPATH_change_flag(reset_MPATH_change_flag340,10206 -function M.add_sh2mf_cmds(345,10283 -function M.add_sh2mf_cmds(add_sh2mf_cmds345,10283 -function M.get_sh2mf_cmds(360,10650 -function M.get_sh2mf_cmds(get_sh2mf_cmds360,10650 -function M.setStatus(376,11081 -function M.setStatus(setStatus376,11081 -function M.status(387,11342 -function M.status(status387,11342 -function M.exists(395,11477 -function M.exists(exists395,11477 -function M.setRebuildTime(404,11807 -function M.setRebuildTime(setRebuildTime404,11807 -local function l_setLoadOrder(414,12170 -function M.serializeTbl(425,12368 -function M.serializeTbl(serializeTbl425,12368 -function M.encodeMT(478,13680 -function M.encodeMT(encodeMT478,13680 -function M.remove(487,13959 -function M.remove(remove487,13959 -local function l_build_AB(492,14034 -function M.list(517,14949 -function M.list(list517,14949 - local function l_loadOrder_cmp(569,17187 -function M.empty(595,17592 -function M.empty(empty595,17592 -function M.add_property(608,17926 -function M.add_property(add_property608,17926 -function M.remove_property(635,18736 -function M.remove_property(remove_property635,18736 -function M.list_w_property(677,20155 -function M.list_w_property(list_w_property677,20155 -function M.haveProperty(707,21206 -function M.haveProperty(haveProperty707,21206 -function M.have(721,21685 -function M.have(have721,21685 -function M.find_possible_sn(729,21863 -function M.find_possible_sn(find_possible_sn729,21863 -function M.lookup_w_userName(748,22245 -function M.lookup_w_userName(lookup_w_userName748,22245 -function M.userName(775,22831 -function M.userName(userName775,22831 -function M.fullName(783,22970 -function M.fullName(fullName783,22970 -function M.wV(791,23109 -function M.wV(wV791,23109 -function M.fn(799,23236 -function M.fn(fn799,23236 -function M.version(807,23363 -function M.version(version807,23363 -function M.stackDepth(815,23520 -function M.stackDepth(stackDepth815,23520 -function M.safely_incr_ref_count(823,23667 -function M.safely_incr_ref_count(safely_incr_ref_count823,23667 -function M.decr_ref_count(841,24283 -function M.decr_ref_count(decr_ref_count841,24283 -function M.get_ref_count(853,24664 -function M.get_ref_count(get_ref_count853,24664 -function M.get_depends_on_anyA(862,24913 -function M.get_depends_on_anyA(get_depends_on_anyA862,24913 -function M.save_depends_on_any(870,25092 -function M.save_depends_on_any(save_depends_on_any870,25092 -function M.pop_depends_on_any(878,25300 -function M.pop_depends_on_any(pop_depends_on_any878,25300 -function M.pop_depends_on_any_ck(888,25572 -function M.pop_depends_on_any_ck(pop_depends_on_any_ck888,25572 -function M.updateMPathA(906,26163 -function M.updateMPathA(updateMPathA906,26163 -function M.modulePathA(917,26491 -function M.modulePathA(modulePathA917,26491 -function M.maxDepthT(921,26547 -function M.maxDepthT(maxDepthT921,26547 -function M.getShortTime(928,26735 -function M.getShortTime(getShortTime928,26735 -function M.getRebuildTime(935,26929 -function M.getRebuildTime(getRebuildTime935,26929 -function M.setRebuildTime(944,27254 -function M.setRebuildTime(setRebuildTime944,27254 -function M.addStickyA(955,27632 -function M.addStickyA(addStickyA955,27632 -function M.getStickyA(965,28007 -function M.getStickyA(getStickyA965,28007 -function M.userLoad(978,28496 -function M.userLoad(userLoad978,28496 -local function l_columnList(986,28750 -function M.reportChanges(1005,29415 -function M.reportChanges(reportChanges1005,29415 -local function l_buildFamilyPrefix(1070,31371 -function M.setfamily(1088,31812 -function M.setfamily(setfamily1088,31812 -function M.unsetfamily(1104,32293 -function M.unsetfamily(unsetfamily1104,32293 -function M.getfamily(1118,32693 -function M.getfamily(getfamily1118,32693 -function M.pushInheritFn(1130,33031 -function M.pushInheritFn(pushInheritFn1130,33031 -function M.popInheritFn(1145,33617 -function M.popInheritFn(popInheritFn1145,33617 -function M.hideHash(1162,34153 -function M.hideHash(hideHash1162,34153 -function M.getHash(1176,34511 -function M.getHash(getHash1176,34511 -function M.setHashSum(1188,34839 -function M.setHashSum(setHashSum1188,34839 -function M.getMTfromFile(1255,37044 -function M.getMTfromFile(getMTfromFile1255,37044 -function M.extractModulesFiles(1472,44384 -function M.extractModulesFiles(extractModulesFiles1472,44384 -function M.setMpathRefCountT(1501,45063 -function M.setMpathRefCountT(setMpathRefCountT1501,45063 -function M.hideMpathRefCountT(1504,45148 -function M.hideMpathRefCountT(hideMpathRefCountT1504,45148 -function M.resetMPATH2system(1508,45229 -function M.resetMPATH2system(resetMPATH2system1508,45229 -function M.name_w_possible_alias(1514,45406 -function M.name_w_possible_alias(name_w_possible_alias1514,45406 -function M.registerConflicts(1532,45978 -function M.registerConflicts(registerConflicts1532,45978 -function M.removeConflicts(1548,46473 -function M.removeConflicts(removeConflicts1548,46473 -function M.haveDSConflict(1557,46690 -function M.haveDSConflict(haveDSConflict1557,46690 +function M.add_actionA(345,10283 +function M.add_actionA(add_actionA345,10283 +function M.get_actionA(354,10525 +function M.get_actionA(get_actionA354,10525 +function M.add_sh2mf_cmds(363,10703 +function M.add_sh2mf_cmds(add_sh2mf_cmds363,10703 +function M.get_sh2mf_cmds(378,11070 +function M.get_sh2mf_cmds(get_sh2mf_cmds378,11070 +function M.setStatus(394,11501 +function M.setStatus(setStatus394,11501 +function M.status(405,11762 +function M.status(status405,11762 +function M.exists(413,11897 +function M.exists(exists413,11897 +function M.setRebuildTime(422,12227 +function M.setRebuildTime(setRebuildTime422,12227 +local function l_setLoadOrder(432,12590 +function M.serializeTbl(443,12788 +function M.serializeTbl(serializeTbl443,12788 +function M.encodeMT(496,14100 +function M.encodeMT(encodeMT496,14100 +function M.remove(505,14379 +function M.remove(remove505,14379 +local function l_build_AB(510,14454 +function M.list(535,15369 +function M.list(list535,15369 + local function l_loadOrder_cmp(587,17607 +function M.empty(613,18012 +function M.empty(empty613,18012 +function M.add_property(626,18346 +function M.add_property(add_property626,18346 +function M.remove_property(653,19156 +function M.remove_property(remove_property653,19156 +function M.list_w_property(695,20575 +function M.list_w_property(list_w_property695,20575 +function M.haveProperty(725,21626 +function M.haveProperty(haveProperty725,21626 +function M.have(739,22105 +function M.have(have739,22105 +function M.find_possible_sn(747,22283 +function M.find_possible_sn(find_possible_sn747,22283 +function M.lookup_w_userName(766,22665 +function M.lookup_w_userName(lookup_w_userName766,22665 +function M.userName(793,23251 +function M.userName(userName793,23251 +function M.fullName(801,23390 +function M.fullName(fullName801,23390 +function M.wV(809,23529 +function M.wV(wV809,23529 +function M.fn(817,23656 +function M.fn(fn817,23656 +function M.version(825,23783 +function M.version(version825,23783 +function M.stackDepth(833,23940 +function M.stackDepth(stackDepth833,23940 +function M.safely_incr_ref_count(841,24087 +function M.safely_incr_ref_count(safely_incr_ref_count841,24087 +function M.decr_ref_count(859,24703 +function M.decr_ref_count(decr_ref_count859,24703 +function M.get_ref_count(871,25084 +function M.get_ref_count(get_ref_count871,25084 +function M.get_depends_on_anyA(880,25333 +function M.get_depends_on_anyA(get_depends_on_anyA880,25333 +function M.save_depends_on_any(888,25512 +function M.save_depends_on_any(save_depends_on_any888,25512 +function M.pop_depends_on_any(896,25720 +function M.pop_depends_on_any(pop_depends_on_any896,25720 +function M.pop_depends_on_any_ck(906,25992 +function M.pop_depends_on_any_ck(pop_depends_on_any_ck906,25992 +function M.updateMPathA(924,26583 +function M.updateMPathA(updateMPathA924,26583 +function M.modulePathA(935,26911 +function M.modulePathA(modulePathA935,26911 +function M.maxDepthT(939,26967 +function M.maxDepthT(maxDepthT939,26967 +function M.getShortTime(946,27155 +function M.getShortTime(getShortTime946,27155 +function M.getRebuildTime(953,27349 +function M.getRebuildTime(getRebuildTime953,27349 +function M.setRebuildTime(962,27674 +function M.setRebuildTime(setRebuildTime962,27674 +function M.addStickyA(973,28052 +function M.addStickyA(addStickyA973,28052 +function M.getStickyA(983,28427 +function M.getStickyA(getStickyA983,28427 +function M.userLoad(996,28916 +function M.userLoad(userLoad996,28916 +local function l_columnList(1004,29170 +function M.reportChanges(1023,29835 +function M.reportChanges(reportChanges1023,29835 +local function l_buildFamilyPrefix(1088,31791 +function M.setfamily(1106,32232 +function M.setfamily(setfamily1106,32232 +function M.unsetfamily(1122,32713 +function M.unsetfamily(unsetfamily1122,32713 +function M.getfamily(1136,33113 +function M.getfamily(getfamily1136,33113 +function M.pushInheritFn(1148,33451 +function M.pushInheritFn(pushInheritFn1148,33451 +function M.popInheritFn(1163,34037 +function M.popInheritFn(popInheritFn1163,34037 +function M.hideHash(1180,34573 +function M.hideHash(hideHash1180,34573 +function M.getHash(1194,34931 +function M.getHash(getHash1194,34931 +function M.setHashSum(1206,35259 +function M.setHashSum(setHashSum1206,35259 +function M.getMTfromFile(1273,37464 +function M.getMTfromFile(getMTfromFile1273,37464 +function M.extractModulesFiles(1492,44851 +function M.extractModulesFiles(extractModulesFiles1492,44851 +function M.setMpathRefCountT(1521,45530 +function M.setMpathRefCountT(setMpathRefCountT1521,45530 +function M.hideMpathRefCountT(1524,45615 +function M.hideMpathRefCountT(hideMpathRefCountT1524,45615 +function M.resetMPATH2system(1528,45696 +function M.resetMPATH2system(resetMPATH2system1528,45696 +function M.name_w_possible_alias(1534,45873 +function M.name_w_possible_alias(name_w_possible_alias1534,45873 +function M.registerConflicts(1552,46445 +function M.registerConflicts(registerConflicts1552,46445 +function M.removeConflicts(1568,46940 +function M.removeConflicts(removeConflicts1568,46940 +function M.haveDSConflict(1577,47157 +function M.haveDSConflict(haveDSConflict1577,47157 src/FrameStk.lua,1303 local function l_new(47,1953 -function M.singleton(62,2281 -function M.singleton(singleton62,2281 -function M.__clear(76,2632 -function M.__clear(__clear76,2632 -function M.resetMPATH2system(86,2842 -function M.resetMPATH2system(resetMPATH2system86,2842 -function M.push(95,3083 -function M.push(push95,3083 -function M.LmodBreak(106,3423 -function M.LmodBreak(LmodBreak106,3423 -function M.pop(113,3647 -function M.pop(pop113,3647 -function M.empty(125,4021 -function M.empty(empty125,4021 -function M.atTop(129,4079 -function M.atTop(atTop129,4079 -function M.stackDepth(133,4137 -function M.stackDepth(stackDepth133,4137 -function M.fullName(137,4197 -function M.fullName(fullName137,4197 -function M.mname(143,4326 -function M.mname(mname143,4326 -function M.userName(148,4418 -function M.userName(userName148,4418 -function M.fn(154,4547 -function M.fn(fn154,4547 -function M.sn(160,4664 -function M.sn(sn160,4664 -function M.version(166,4781 -function M.version(version166,4781 -function M.mt(172,4908 -function M.mt(mt172,4908 -function M.origMT(177,4994 -function M.origMT(origMT177,4994 -function M.varT(181,5047 -function M.varT(varT181,5047 -function M.count(186,5137 -function M.count(count186,5137 -function M.traceBack(190,5188 -function M.traceBack(traceBack190,5188 +function M.singleton(63,2323 +function M.singleton(singleton63,2323 +function M.__clear(77,2674 +function M.__clear(__clear77,2674 +function M.resetMPATH2system(87,2884 +function M.resetMPATH2system(resetMPATH2system87,2884 +function M.push(96,3125 +function M.push(push96,3125 +function M.LmodBreak(107,3465 +function M.LmodBreak(LmodBreak107,3465 +function M.pop(114,3689 +function M.pop(pop114,3689 +function M.empty(126,4063 +function M.empty(empty126,4063 +function M.atTop(130,4121 +function M.atTop(atTop130,4121 +function M.stackDepth(134,4179 +function M.stackDepth(stackDepth134,4179 +function M.fullName(138,4239 +function M.fullName(fullName138,4239 +function M.mname(144,4387 +function M.mname(mname144,4387 +function M.userName(149,4479 +function M.userName(userName149,4479 +function M.fn(155,4627 +function M.fn(fn155,4627 +function M.sn(161,4763 +function M.sn(sn161,4763 +function M.version(167,4899 +function M.version(version167,4899 +function M.mt(173,5045 +function M.mt(mt173,5045 +function M.origMT(178,5131 +function M.origMT(origMT178,5131 +function M.varT(182,5184 +function M.varT(varT182,5184 +function M.count(187,5274 +function M.count(count187,5274 +function M.traceBack(191,5325 +function M.traceBack(traceBack191,5325 src/printEnvT.lua,78 function cmdDir(46,1093 @@ -1045,7 +1043,7 @@ function M.date(date19,403 function M.name(20,458 function M.name(name20,458 -src/MRC.lua,1783 +src/MRC.lua,1745 local function l_new(77,2888 function M.singleton(110,4066 function M.singleton(singleton110,4066 @@ -1077,20 +1075,19 @@ function M.extract(416,12952 function M.extract(extract416,12952 function M.export(423,13159 function M.export(export423,13159 -function M.getHiddenT(432,13455 -function M.getHiddenT(getHiddenT432,13455 -local function l_import_helper(459,14087 -function M.import(471,14363 -function M.import(import471,14363 -function M.isVisible(488,14874 -function M.isVisible(isVisible488,14874 -function M.update(514,15564 -function M.update(update514,15564 -function l_find_all_su_defaults(521,15712 -function M.find_wght_for_fullName(535,16074 -function M.find_wght_for_fullName(find_wght_for_fullName535,16074 -function M.applyWeights(589,17333 -function M.applyWeights(applyWeights589,17333 +local function l_getHiddenT(432,13455 +local function l_import_helper(459,14093 +function M.import(471,14369 +function M.import(import471,14369 +function M.isVisible(488,14880 +function M.isVisible(isVisible488,14880 +function M.update(514,15576 +function M.update(update514,15576 +function l_find_all_su_defaults(521,15724 +function M.find_wght_for_fullName(535,16086 +function M.find_wght_for_fullName(find_wght_for_fullName535,16086 +function M.applyWeights(589,17345 +function M.applyWeights(applyWeights589,17345 src/ReadLmodRC.lua,428 local function l_buildRC(55,2172 @@ -1193,7 +1190,7 @@ src/mrc_sandbox.lua,74 local function l_mrc_run5_1(79,3472 local function l_mrc_run5_2(92,4148 -src/MName.lua,2963 +src/MName.lua,2965 function M.className(52,2104 function M.className(className52,2104 local function l_lessthan(56,2159 @@ -1204,72 +1201,72 @@ local function l_overRide_sType(158,5205 function M.buildA(167,5525 function M.buildA(buildA167,5525 local function l_lazyEval(183,5869 -function M.valid(277,8973 -function M.valid(valid277,8973 -function M.userName(285,9079 -function M.userName(userName285,9079 -function M.origUserName(289,9136 -function M.origUserName(origUserName289,9136 -function M.sn(293,9201 -function M.sn(sn293,9201 -function M.fn(302,9364 -function M.fn(fn302,9364 -function M.version(311,9527 -function M.version(version311,9527 -function M.wV(318,9639 -function M.wV(wV318,9639 -function M.stackDepth(325,9741 -function M.stackDepth(stackDepth325,9741 -function M.setStackDepth(333,9926 -function M.setStackDepth(setStackDepth333,9926 -function M.set_ref_count(337,9998 -function M.set_ref_count(set_ref_count337,9998 -function M.set_depends_on_anyA(341,10069 -function M.set_depends_on_anyA(set_depends_on_anyA341,10069 -function M.get_depends_on_anyA(345,10172 -function M.get_depends_on_anyA(get_depends_on_anyA345,10172 -function M.ref_count(352,10308 -function M.ref_count(ref_count352,10308 -function M.fullName(359,10424 -function M.fullName(fullName359,10424 -function M.find_exact_match(428,13153 -function M.find_exact_match(find_exact_match428,13153 -function M.find_exact_match_meta_module(463,14239 -function M.find_exact_match_meta_module(find_exact_match_meta_module463,14239 -local function l_find_highest_by_key(493,15175 -function M.find_highest(532,16361 -function M.find_highest(find_highest532,16361 -function M.find_latest(536,16453 -function M.find_latest(find_latest536,16453 -function M.find_between(540,16543 -function M.find_between(find_between540,16543 -function M.find_inherit_match(587,17915 -function M.find_inherit_match(find_inherit_match587,17915 -local function l_rangeCk(591,17990 -function M.isloaded(621,19157 -function M.isloaded(isloaded621,19157 -function M.isPending(653,20104 -function M.isPending(isPending653,20104 -function M.defaultKind(666,20453 -function M.defaultKind(defaultKind666,20453 -function M.prereq(681,20756 -function M.prereq(prereq681,20756 -function M.conflictCk(715,21657 -function M.conflictCk(conflictCk715,21657 -function M.downstreamConflictCk(741,22472 -function M.downstreamConflictCk(downstreamConflictCk741,22472 -function M.set_depends_on_flag(765,23183 -function M.set_depends_on_flag(set_depends_on_flag765,23183 -function M.get_depends_on_flag(776,23438 -function M.get_depends_on_flag(get_depends_on_flag776,23438 -function M.reset(781,23564 -function M.reset(reset781,23564 -function M.actionName(788,23700 -function M.actionName(actionName788,23700 -function M.show(796,23916 -function M.show(show796,23916 -function M.print(800,23983 -function M.print(print800,23983 +function M.valid(278,9003 +function M.valid(valid278,9003 +function M.userName(286,9109 +function M.userName(userName286,9109 +function M.origUserName(290,9166 +function M.origUserName(origUserName290,9166 +function M.sn(294,9231 +function M.sn(sn294,9231 +function M.fn(303,9394 +function M.fn(fn303,9394 +function M.version(312,9557 +function M.version(version312,9557 +function M.wV(319,9669 +function M.wV(wV319,9669 +function M.stackDepth(326,9771 +function M.stackDepth(stackDepth326,9771 +function M.setStackDepth(334,9956 +function M.setStackDepth(setStackDepth334,9956 +function M.set_ref_count(338,10028 +function M.set_ref_count(set_ref_count338,10028 +function M.set_depends_on_anyA(342,10099 +function M.set_depends_on_anyA(set_depends_on_anyA342,10099 +function M.get_depends_on_anyA(346,10202 +function M.get_depends_on_anyA(get_depends_on_anyA346,10202 +function M.ref_count(353,10338 +function M.ref_count(ref_count353,10338 +function M.fullName(360,10454 +function M.fullName(fullName360,10454 +function M.find_exact_match(429,13183 +function M.find_exact_match(find_exact_match429,13183 +function M.find_exact_match_meta_module(464,14268 +function M.find_exact_match_meta_module(find_exact_match_meta_module464,14268 +local function l_find_highest_by_key(494,15204 +function M.find_highest(539,16567 +function M.find_highest(find_highest539,16567 +function M.find_latest(543,16659 +function M.find_latest(find_latest543,16659 +function M.find_between(547,16749 +function M.find_between(find_between547,16749 +function M.find_inherit_match(594,18121 +function M.find_inherit_match(find_inherit_match594,18121 +local function l_rangeCk(598,18196 +function M.isloaded(628,19381 +function M.isloaded(isloaded628,19381 +function M.isPending(660,20328 +function M.isPending(isPending660,20328 +function M.defaultKind(673,20677 +function M.defaultKind(defaultKind673,20677 +function M.prereq(688,20980 +function M.prereq(prereq688,20980 +function M.conflictCk(722,21881 +function M.conflictCk(conflictCk722,21881 +function M.downstreamConflictCk(748,22696 +function M.downstreamConflictCk(downstreamConflictCk748,22696 +function M.set_depends_on_flag(772,23407 +function M.set_depends_on_flag(set_depends_on_flag772,23407 +function M.get_depends_on_flag(783,23662 +function M.get_depends_on_flag(get_depends_on_flag783,23662 +function M.reset(788,23788 +function M.reset(reset788,23788 +function M.actionName(795,23924 +function M.actionName(actionName795,23924 +function M.show(803,24140 +function M.show(show803,24140 +function M.print(807,24207 +function M.print(print807,24207 src/MC_CheckSyntax.lua,162 function M.add_property(107,4627 @@ -1280,47 +1277,47 @@ function M.userInGroups(userInGroups120,5080 src/Var.lua,1544 local function l_extract_Lmod_var_table(73,2903 local function l_dynamicMP(106,3797 -local function l_dynamicMRC(123,4476 -local function l_processDynamicVars(145,5120 -local function l_extract(162,5823 -function M.new(233,8118 -function M.new(new233,8118 -function M.myName(249,8479 -function M.myName(myName249,8479 -local function l_remFunc(258,8834 -function M.remove(300,10172 -function M.remove(remove300,10172 -local function l_insertFunc(342,11633 -function M.prepend(386,13022 -function M.prepend(prepend386,13022 -function M.append(438,14606 -function M.append(append438,14606 -function M.complete(481,15907 -function M.complete(complete481,15907 -function M.uncomplete(487,16040 -function M.uncomplete(uncomplete487,16040 -function M.set(497,16311 -function M.set(set497,16311 -function M.pop(511,16764 -function M.pop(pop511,16764 -function M.prt(564,18174 -function M.prt(prt564,18174 -function M.set_ref_countT(596,19150 -function M.set_ref_countT(set_ref_countT596,19150 -function M.refCountT(603,19292 -function M.refCountT(refCountT603,19292 -function M.unset(617,19597 -function M.unset(unset617,19597 -function M.expand(638,20273 -function M.expand(expand638,20273 -function M.setAlias(771,23619 -function M.setAlias(setAlias771,23619 -function M.unsetAlias(780,23867 -function M.unsetAlias(unsetAlias780,23867 -function M.setShellFunction(790,24185 -function M.setShellFunction(setShellFunction790,24185 -function M.unsetShellFunction(798,24464 -function M.unsetShellFunction(unsetShellFunction798,24464 +local function l_dynamicMRC(127,4617 +local function l_processDynamicVars(149,5307 +local function l_extract(166,6064 +function M.new(237,8359 +function M.new(new237,8359 +function M.myName(253,8720 +function M.myName(myName253,8720 +local function l_remFunc(262,9075 +function M.remove(304,10413 +function M.remove(remove304,10413 +local function l_insertFunc(346,11888 +function M.prepend(390,13277 +function M.prepend(prepend390,13277 +function M.append(441,14846 +function M.append(append441,14846 +function M.complete(484,16141 +function M.complete(complete484,16141 +function M.uncomplete(490,16274 +function M.uncomplete(uncomplete490,16274 +function M.set(500,16545 +function M.set(set500,16545 +function M.pop(514,17007 +function M.pop(pop514,17007 +function M.prt(567,18424 +function M.prt(prt567,18424 +function M.set_ref_countT(599,19400 +function M.set_ref_countT(set_ref_countT599,19400 +function M.refCountT(606,19542 +function M.refCountT(refCountT606,19542 +function M.unset(620,19847 +function M.unset(unset620,19847 +function M.expand(641,20532 +function M.expand(expand641,20532 +function M.setAlias(774,23878 +function M.setAlias(setAlias774,23878 +function M.unsetAlias(783,24126 +function M.unsetAlias(unsetAlias783,24126 +function M.setShellFunction(793,24444 +function M.setShellFunction(setShellFunction793,24444 +function M.unsetShellFunction(801,24723 +function M.unsetShellFunction(unsetShellFunction801,24723 src/StandardPackage.lua,159 local function l_site_name_hook(59,2453 @@ -1376,7 +1373,7 @@ function M.prereq(prereq75,2575 src/tcl2lua.tcl,125 global g_loadT g_varsT g_fullName g_usrName g_shellName g_mode g_shellType g_outputA,37,1659 -set g_help $params(1160,30171 +set g_help $params(1165,30303 src/Options.lua,134 local function l_prt(73,2966 @@ -1434,7 +1431,7 @@ function M.add_property(add_property322,11026 function M.remove_property(341,11740 function M.remove_property(remove_property341,11740 -src/Hub.lua,1439 +src/Hub.lua,1485 local function l_new(71,2763 function M.singleton(84,3046 function M.singleton(singleton84,3046 @@ -1448,31 +1445,32 @@ function M.mgrload(272,8610 function M.mgrload(mgrload272,8610 function M.load(295,9259 function M.load(load295,9259 -function M.unload(488,16779 -function M.unload(unload488,16779 -function M.reloadAll(574,19954 -function M.reloadAll(reloadAll574,19954 -function M.refresh(691,24902 -function M.refresh(refresh691,24902 -function M.dependencyCk(726,26195 -function M.dependencyCk(dependencyCk726,26195 -function M.reload_sticky(759,27266 -function M.reload_sticky(reload_sticky759,27266 -function M.safeToUpdate(819,29079 -function M.safeToUpdate(safeToUpdate819,29079 -local function l_availEntry(823,29133 -local function mark_as_default(857,29935 -local function regroup_avail_blocks(862,30081 -function M.overview(935,31932 -function M.overview(overview935,31932 - local function print_overview_block(998,33762 - local function register_sn_count_in_b(1014,34391 -function M.buildExtA(1070,35928 -function M.buildExtA(buildExtA1070,35928 -function M.terse_avail(1118,37256 -function M.terse_avail(terse_avail1118,37256 -function M.avail(1191,39308 -function M.avail(avail1191,39308 +local function l_missingFn_action(483,16549 +function M.unload(509,17374 +function M.unload(unload509,17374 +function M.reloadAll(600,20702 +function M.reloadAll(reloadAll600,20702 +function M.refresh(717,25650 +function M.refresh(refresh717,25650 +function M.dependencyCk(752,26943 +function M.dependencyCk(dependencyCk752,26943 +function M.reload_sticky(785,28014 +function M.reload_sticky(reload_sticky785,28014 +function M.safeToUpdate(845,29827 +function M.safeToUpdate(safeToUpdate845,29827 +local function l_availEntry(849,29881 +local function mark_as_default(884,30728 +local function regroup_avail_blocks(889,30874 +function M.overview(962,32725 +function M.overview(overview962,32725 + local function print_overview_block(1025,34559 + local function register_sn_count_in_b(1041,35188 +function M.buildExtA(1097,36725 +function M.buildExtA(buildExtA1097,36725 +function M.terse_avail(1145,38053 +function M.terse_avail(terse_avail1145,38053 +function M.avail(1223,40355 +function M.avail(avail1223,40355 src/ml_cmd.in.lua,111 function cmdDir(92,3409 @@ -1509,71 +1507,71 @@ function load_any(209,7118 local function l_convert2table(223,7616 local function l_cleanupPathArgs(240,7941 function prepend_path(256,8338 -function append_path(268,8746 -function remove_path(279,9146 -function pushenv(292,9600 -function setenv(303,9918 -function unsetenv(314,10233 -function execute(326,10597 -function family(340,11044 -function loaded_modules(353,11390 -function inherit(365,11711 -function mode(374,11930 -function haveDynamicMPATH(379,11987 -function is_spider(388,12254 -function isloaded(398,12513 -function isAvail(406,12727 -function myFileName(415,12937 -function myModuleFullName(421,13104 -function myModuleName(427,13293 -function myModuleUsrName(433,13484 -function myModuleVersion(439,13660 -function isPending(446,13888 -function LmodError(454,14153 -function LmodWarning(461,14341 -function LmodMessage(468,14508 -function LmodMsgRaw(475,14675 -function LmodVersion(482,14854 -function myShellName(488,15015 -function myShellType(492,15071 -function whatis(498,15235 -function help(508,15515 -function userInGroups(516,15664 -function convertToCanonical(529,16078 -function prereq(539,16374 -function prereq_any(550,16804 -function conflict(560,17185 -function atleast(573,17621 -function atmost(587,18010 -function between(602,18432 -function latest(614,18786 -function set_alias(627,19071 -function unset_alias(637,19382 -function set_shell_function(647,19720 -function unset_shell_function(657,20075 -function add_property(669,20463 -function remove_property(678,20784 -function hierarchyA(690,21223 -function moduleStackTraceBack(736,22257 -function requireFullName(761,22912 -function LmodErrorExit(770,23212 -function LmodSystemError(777,23393 -function try_load(786,23824 -function unload_usr_internal(795,24070 -function unload_internal(809,24469 -function unload(827,25071 -function always_load(837,25423 -function always_unload(852,25846 -function depends_on(859,26004 -function depends_on_any(867,26247 -function extensions(875,26510 -function color_banner(883,26726 -function source_sh(888,26788 -function complete(895,26986 -function uncomplete(902,27253 -function LmodBreak(909,27508 -function purge(916,27702 -function subprocess(926,27848 +function append_path(268,8742 +function remove_path(279,9142 +function pushenv(292,9596 +function setenv(303,9914 +function unsetenv(314,10229 +function execute(326,10593 +function family(340,11040 +function loaded_modules(353,11386 +function inherit(365,11707 +function mode(374,11926 +function haveDynamicMPATH(379,11983 +function is_spider(388,12250 +function isloaded(398,12509 +function isAvail(406,12723 +function myFileName(415,12933 +function myModuleFullName(421,13100 +function myModuleName(427,13289 +function myModuleUsrName(433,13480 +function myModuleVersion(439,13656 +function isPending(446,13884 +function LmodError(454,14149 +function LmodWarning(461,14337 +function LmodMessage(468,14504 +function LmodMsgRaw(475,14671 +function LmodVersion(482,14850 +function myShellName(488,15011 +function myShellType(492,15067 +function whatis(498,15231 +function help(508,15511 +function userInGroups(516,15660 +function convertToCanonical(529,16074 +function prereq(540,16443 +function prereq_any(551,16873 +function conflict(561,17254 +function atleast(574,17690 +function atmost(588,18079 +function between(603,18501 +function latest(615,18855 +function set_alias(628,19140 +function unset_alias(638,19451 +function set_shell_function(648,19789 +function unset_shell_function(658,20144 +function add_property(670,20532 +function remove_property(679,20853 +function hierarchyA(691,21292 +function moduleStackTraceBack(737,22326 +function requireFullName(762,22981 +function LmodErrorExit(771,23281 +function LmodSystemError(778,23462 +function try_load(787,23893 +function unload_usr_internal(796,24139 +function unload_internal(810,24538 +function unload(828,25140 +function always_load(838,25492 +function always_unload(853,25915 +function depends_on(860,26073 +function depends_on_any(868,26316 +function extensions(876,26579 +function color_banner(884,26795 +function source_sh(889,26857 +function complete(896,27055 +function uncomplete(903,27322 +function LmodBreak(910,27577 +function purge(917,27771 +function subprocess(927,27917 src/loadModuleFile.lua,33 function loadModuleFile(60,2548 @@ -1674,8 +1672,8 @@ src/lmod.in.lua,128 function cmdDir(97,3490 function cmdName(103,3648 function Usage(139,4804 -function version(236,9448 -function main(245,9794 +function version(235,9425 +function main(244,9771 src/mrc_funcs.lua,129 function module_version(42,1900 @@ -1683,7 +1681,7 @@ function module_alias(49,2119 function hide_version(54,2261 function hide_modulefile(60,2389 -src/utils.lua,2044 +src/utils.lua,2010 function argsPack(76,2914 function __FILE__(82,3070 function __LINE__(86,3133 @@ -1702,47 +1700,46 @@ function findAdminFn(347,10329 function readAdmin(364,10990 function getMT(437,13198 function getModuleRCT(465,13879 -function isActiveMFile(513,15430 -function isMarked(523,15915 -function length(534,16213 -function optionTbl(543,16415 -function paired2pathT(549,16486 -function path2pathA(590,17625 -function quiet(629,18440 -function regular_cmp(636,18579 -function sanizatizeTbl(644,18636 -function setenv_lmod_version(679,19569 -function ShowCmdA(706,20337 -local function l_arg2str(722,20726 -function s_indent(744,21253 -function ShowCmdStr(752,21549 -function ShowHelpStr(804,22751 -function UUIDString(826,23335 -function case_independent_cmp(854,24179 -function activateWarning(871,24675 -function deactivateWarning(877,24847 -function haveWarnings(883,25025 -function setStatusFlag(889,25184 -function getStatusFlag(896,25373 -local function l_restoreEnv(900,25422 -local function l_runTCLprog(928,25984 -local function l_build_runTCLprog(948,26687 -function usingFastTCLInterp(962,27036 -local function l_build_accept_function(968,27273 -local function l_build_allow_dups_function(982,27570 -local function l_build_epoch_function(995,27860 -local function l_build_prepend_order_function(1030,28824 -function setSyntaxMode(1052,29347 -function checkSyntaxMode(1055,29410 -local function l_build_quarantineT(1061,29494 -function save_set_env(1074,29832 -function reset_env(1084,30050 -function initialize_lmod(1099,30379 -function tracing_msg(1164,32709 -function dynamic_shell(1178,33082 -function locatePkg(1227,34462 -function wrap_complete(1239,34695 -function unwrap_complete(1242,34765 +function isMarked(518,15756 +function length(529,16054 +function optionTbl(538,16256 +function paired2pathT(544,16327 +function path2pathA(585,17466 +function quiet(629,18488 +function regular_cmp(636,18627 +function sanizatizeTbl(644,18684 +function setenv_lmod_version(679,19617 +function ShowCmdA(706,20385 +local function l_arg2str(722,20774 +function s_indent(744,21301 +function ShowCmdStr(752,21597 +function ShowHelpStr(804,22799 +function UUIDString(826,23383 +function case_independent_cmp(854,24227 +function activateWarning(871,24723 +function deactivateWarning(877,24895 +function haveWarnings(883,25073 +function setStatusFlag(889,25232 +function getStatusFlag(896,25421 +local function l_restoreEnv(900,25470 +local function l_runTCLprog(928,26032 +local function l_build_runTCLprog(948,26735 +function usingFastTCLInterp(962,27084 +local function l_build_accept_function(968,27321 +local function l_build_allow_dups_function(982,27618 +local function l_build_epoch_function(995,27908 +local function l_build_prepend_order_function(1030,28872 +function setSyntaxMode(1052,29395 +function checkSyntaxMode(1055,29458 +local function l_build_quarantineT(1061,29542 +function save_set_env(1074,29880 +function reset_env(1084,30098 +function initialize_lmod(1099,30427 +function tracing_msg(1164,32757 +function dynamic_shell(1178,33130 +function locatePkg(1227,34510 +function wrap_complete(1239,34743 +function unwrap_complete(1242,34813 src/cmdfuncs.lua,1144 local function l_Access(76,3264 @@ -1788,42 +1785,42 @@ src/ModuleA.lua,1510 local function l_addPV(67,2795 local function l_GroupIntoModules(110,4170 local function l_build(140,5337 -local function l_find_vA(159,5909 -local function l_find_vB(194,6750 -local function l_search(235,7737 -function M.applyWeights(256,8402 -function M.applyWeights(applyWeights256,8402 -function M.__find_all_defaults(287,9414 -function M.__find_all_defaults(__find_all_defaults287,9414 - local function l_find_all_defaults_helper(294,9663 -function M.build_availA(365,12030 -function M.build_availA(build_availA365,12030 - local function l_build_availA_helper(370,12186 -function M.inherited_search(412,13595 -function M.inherited_search(inherited_search412,13595 - local function l_inherited_search_helper(415,13732 -function M.search(484,15820 -function M.search(search484,15820 -local function l_checkforNV(496,16070 -local function l_build_from_spiderT(505,16226 -function M.update(535,17280 -function M.update(update535,17280 -function M.__new(599,19482 -function M.__new(__new599,19482 -function M.moduleA(633,20497 -function M.moduleA(moduleA633,20497 -function M.isNVV(637,20552 -function M.isNVV(isNVV637,20552 -function M.spiderBuilt(641,20603 -function M.spiderBuilt(spiderBuilt641,20603 -function M.locationT(645,20666 -function M.locationT(locationT645,20666 -function M.defaultT(655,20882 -function M.defaultT(defaultT655,20882 -function M.singleton(667,21148 -function M.singleton(singleton667,21148 -function M.__clear(693,21893 -function M.__clear(__clear693,21893 +local function l_find_vA(159,5903 +local function l_find_vB(194,6751 +local function l_search(235,7747 +function M.applyWeights(258,8497 +function M.applyWeights(applyWeights258,8497 +function M.__find_all_defaults(289,9505 +function M.__find_all_defaults(__find_all_defaults289,9505 + local function l_find_all_defaults_helper(296,9752 +function M.build_availA(367,12117 +function M.build_availA(build_availA367,12117 + local function l_build_availA_helper(372,12273 +function M.inherited_search(415,13731 +function M.inherited_search(inherited_search415,13731 + local function l_inherited_search_helper(418,13868 +function M.search(487,15956 +function M.search(search487,15956 +local function l_checkforNV(504,16429 +local function l_build_from_spiderT(513,16585 +function M.update(543,17633 +function M.update(update543,17633 +function M.__new(607,19831 +function M.__new(__new607,19831 +function M.moduleA(637,20680 +function M.moduleA(moduleA637,20680 +function M.isNVV(641,20735 +function M.isNVV(isNVV641,20735 +function M.spiderBuilt(645,20786 +function M.spiderBuilt(spiderBuilt645,20786 +function M.locationT(649,20849 +function M.locationT(locationT649,20849 +function M.defaultT(659,21065 +function M.defaultT(defaultT659,21065 +function M.singleton(671,21331 +function M.singleton(singleton671,21331 +function M.__clear(697,22070 +function M.__clear(__clear697,22070 logos/2x/Lmod-black@2x.png,110 NKKvڵcO{C~}Ji(e8FB=_X4$ɡ9 }h<`AxZ߄fdtVzAxZ߄fdtV5,2308 @@ -1864,43 +1861,43 @@ init/R,23 init/zsh/_module,443 _module(4,35 -_module_command(36,2351 -_module_loaded_modules(95,4295 -_module_available_modules(101,4471 -_module_spider_list(109,4697 -_module_restore(114,4798 -_module_disable(120,4935 -_ml_mcc(126,5072 -_ml_describe(132,5201 -_module_help(139,5366 -_module_load(146,5489 -_module_spider(153,5610 -_module_unload(160,5724 -_module_swap(167,5846 -_module_show(181,6139 -_module_use(191,6315 -_module_unuse(199,6495 -_module_whatis(205,6587 +_module_command(39,2628 +_module_loaded_modules(98,4572 +_module_available_modules(104,4748 +_module_spider_list(112,4974 +_module_restore(117,5075 +_module_disable(123,5212 +_ml_mcc(129,5349 +_ml_describe(135,5478 +_module_help(142,5643 +_module_load(149,5766 +_module_spider(156,5887 +_module_unload(163,6001 +_module_swap(170,6123 +_module_show(184,6416 +_module_use(194,6592 +_module_unuse(202,6772 +_module_whatis(208,6864 init/zsh/_ml,396 _ml(4,31 -_ml_loaded_modules_negated(164,5561 -_ml_loaded_modules(169,5722 -_ml_available_modules(177,5897 -_ml_spider_list(185,6120 -_ml_unload(191,6218 -_ml_restore(197,6294 -_ml_mcc(203,6427 -_ml_describe(209,6556 -_ml_disable(215,6690 -_ml_help(221,6823 -_ml_swap(227,6903 -_ml_show(239,7146 -_ml_load(246,7257 -_ml_use(253,7367 -_ml_unuse(261,7543 -_ml_whatis(267,7631 -_ml_spider(273,7713 +_ml_loaded_modules_negated(167,5725 +_ml_loaded_modules(172,5886 +_ml_available_modules(180,6061 +_ml_spider_list(188,6284 +_ml_unload(194,6382 +_ml_restore(200,6458 +_ml_mcc(206,6591 +_ml_describe(212,6720 +_ml_disable(218,6854 +_ml_help(224,6987 +_ml_swap(230,7067 +_ml_show(242,7310 +_ml_load(249,7421 +_ml_use(256,7531 +_ml_unuse(264,7707 +_ml_whatis(270,7795 +_ml_spider(276,7877 init/profile.in,345 LMOD_ALLOW_ROOT_USE=7,262 @@ -1971,25 +1968,26 @@ init/ksh_funcs/ml,13 init/ksh_funcs/clearMT,18 clearMT(6,202 -init/bash.in,410 +init/bash.in,484 *v*x*) __lmod_vx=10,259 *v*) __lmod_vx=11,289 *x*) __lmod_vx=12,319 esac;13,349 -SUPPORT_KSH=26,681 - zv=29,809 - orig_zsh_version=30,833 - module(87,2865 - module(94,3072 -LMOD_VERSION=128,4115 - settarg 132,4211 -ml(148,4692 -clearMT(163,5038 -clearLmod(168,5109 -xSetTitleLmod(174,5208 - set -$__lmod_vx;$__lmod_vx190,5682 - unset __lmod_vx;191,5701 -fi;192,5720 +__build_FPATH_for_zsh_ksh(26,681 + export __LMOD_SET_ZSH_FPATH=34,944 + export FPATH=44,1214 + export __LMOD_SET_KSH_FPATH=46,1312 + module(97,3060 + module(104,3267 +LMOD_VERSION=138,4310 + settarg 142,4406 +ml(158,4887 +clearMT(173,5233 +clearLmod(178,5304 +xSetTitleLmod(184,5403 + set -$__lmod_vx;$__lmod_vx200,5877 + unset __lmod_vx;201,5896 +fi;202,5915 init/sh.in,43 LMOD_ROOT=3,11 @@ -2012,7 +2010,7 @@ _module_describe(90,2574 _module_not_yet_loaded(94,2669 _module_long_arg_list(98,2765 _module(118,3302 -_ml(185,5289 +_ml(185,5337 init/lisp,578 ;; call-process on Emacs cannot write stderr to a separate buffer35,1322 @@ -2391,466 +2389,466 @@ export __LMOD_REF_COUNT_MODULEPATH;12,368 MODULEPATH=13,404 export MODULEPATH;14,449 _LMFILES_=15,468 -export _LMFILES_;16,596 -_ModuleTable_=17,614 -export _ModuleTable_;18,1214 -export MODULEPATH;24,1407 -_ModuleTable_=25,1426 -export _ModuleTable_;26,2026 -export LOADEDMODULES;32,2195 -MODULEPATH=33,2217 -export MODULEPATH;34,2262 -_LMFILES_=35,2281 -export _LMFILES_;36,2331 -_ModuleTable_=37,2349 -export _ModuleTable_;38,2657 -export MODULEPATH;44,2850 -_ModuleTable_=45,2869 -export _ModuleTable_;46,3177 -MODULEPATH=52,3350 -export MODULEPATH;53,3395 -unset _LMFILES_;54,3414 -_ModuleTable_=55,3431 -export _ModuleTable_;56,3599 -export LOADEDMODULES;62,3774 -MODULEPATH=63,3796 -export MODULEPATH;64,3841 -_LMFILES_=65,3860 -export _LMFILES_;66,4027 -_ModuleTable_=67,4045 -export _ModuleTable_;68,4797 -export MODULEPATH;74,4990 -_ModuleTable_=75,5009 -export _ModuleTable_;76,5761 -export MODULEPATH;82,5954 -_ModuleTable_=83,5973 -export _ModuleTable_;84,6725 -export LOADEDMODULES;90,6897 -MODULEPATH=91,6919 -export MODULEPATH;92,6964 -_LMFILES_=93,6983 -export _LMFILES_;94,7072 -_ModuleTable_=95,7090 -export _ModuleTable_;96,7550 -export MODULEPATH;102,7744 -_ModuleTable_=103,7763 -export _ModuleTable_;104,8223 -MODULEPATH=110,8397 -export MODULEPATH;111,8442 -unset _LMFILES_;112,8461 -_ModuleTable_=113,8478 -export _ModuleTable_;114,8646 -export MODULEPATH;120,8840 -_ModuleTable_=121,8859 -export _ModuleTable_;122,9027 -export LOADEDMODULES;128,9199 -MODULEPATH=129,9221 -export MODULEPATH;130,9266 -_LMFILES_=131,9285 -export _LMFILES_;132,9413 -_ModuleTable_=133,9431 -export _ModuleTable_;134,10043 -export LOADEDMODULES;140,10215 -MODULEPATH=141,10237 -export MODULEPATH;142,10282 -_LMFILES_=143,10301 -export _LMFILES_;144,10390 -_ModuleTable_=145,10408 -export _ModuleTable_;146,10868 -export LOADEDMODULES;152,11043 -MODULEPATH=153,11065 -export MODULEPATH;154,11110 -_LMFILES_=155,11129 -export _LMFILES_;156,11296 -_ModuleTable_=157,11314 -export _ModuleTable_;158,12066 -__LMOD_DEFAULT_MODULES_LOADED__=159,12088 -export __LMOD_DEFAULT_MODULES_LOADED__;160,12123 -export LOADEDMODULES;166,12315 -MODULEPATH=167,12337 -export MODULEPATH;168,12382 -_LMFILES_=169,12401 -export _LMFILES_;170,12529 -_ModuleTable_=171,12547 -export _ModuleTable_;172,13147 -MODULEPATH=178,13318 -export MODULEPATH;179,13363 -unset _LMFILES_;180,13382 -_ModuleTable_=181,13399 -export _ModuleTable_;182,13567 -export LOADEDMODULES;188,13737 -MODULEPATH=189,13759 -export MODULEPATH;190,13804 -_LMFILES_=191,13823 -export _LMFILES_;192,13912 -_ModuleTable_=193,13930 -export _ModuleTable_;194,14390 -export MODULEPATH;200,14584 -_ModuleTable_=201,14603 -export _ModuleTable_;202,15063 -export MODULEPATH;208,15257 -_ModuleTable_=209,15276 -export _ModuleTable_;210,15736 -export MODULEPATH;216,15933 -_ModuleTable_=217,15952 -export _ModuleTable_;218,16412 -__LMOD_DEFAULT_MODULES_LOADED__=219,16434 -export __LMOD_DEFAULT_MODULES_LOADED__;220,16469 -MODULEPATH=226,16661 -export MODULEPATH;227,16706 -unset _LMFILES_;228,16725 -_ModuleTable_=229,16742 -export _ModuleTable_;230,16910 -export MODULEPATH;236,17104 -_ModuleTable_=237,17123 -export _ModuleTable_;238,17291 -export MODULEPATH;244,17486 -_ModuleTable_=245,17505 -export _ModuleTable_;246,17673 -export LOADEDMODULES;252,17849 -MODULEPATH=253,17871 -export MODULEPATH;254,17916 -_LMFILES_=255,17935 -export _LMFILES_;256,18102 -_ModuleTable_=257,18120 -export _ModuleTable_;258,18872 -export MODULEPATH;264,19066 -_ModuleTable_=265,19085 -export _ModuleTable_;266,19837 -MODULEPATH=272,20008 -export MODULEPATH;273,20053 -unset _LMFILES_;274,20072 -_ModuleTable_=275,20089 -export _ModuleTable_;276,20257 -export LOADEDMODULES;282,20432 -MODULEPATH=283,20454 -export MODULEPATH;284,20499 -_LMFILES_=285,20518 -export _LMFILES_;286,20685 -_ModuleTable_=287,20703 -export _ModuleTable_;288,21455 -__LMOD_DEFAULT_MODULES_LOADED__=289,21477 -export __LMOD_DEFAULT_MODULES_LOADED__;290,21512 -export MODULEPATH;296,21724 -_ModuleTable_=297,21743 -export _ModuleTable_;298,22495 -MODULEPATH=304,22666 -export MODULEPATH;305,22711 -unset _LMFILES_;306,22730 -_ModuleTable_=307,22747 -export _ModuleTable_;308,22915 -export LOADEDMODULES;319,23230 -MODULEPATH=320,23252 -export MODULEPATH;321,23297 -_LMFILES_=322,23316 -export _LMFILES_;323,23372 -_ModuleTable_=324,23390 -export _ModuleTable_;325,23726 -bar=326,23748 -export bar;327,23757 -export LOADEDMODULES;333,23931 -MODULEPATH=334,23953 -export MODULEPATH;335,23998 -_LMFILES_=336,24017 -export _LMFILES_;337,24118 -_ModuleTable_=338,24136 -export _ModuleTable_;339,24658 -bar=340,24680 -export bar;341,24689 -export MODULEPATH;347,24873 -_ModuleTable_=348,24892 -export _ModuleTable_;349,25414 -MODULEPATH=355,25585 -export MODULEPATH;356,25630 -unset _LMFILES_;357,25649 -_ModuleTable_=358,25666 -export _ModuleTable_;359,25834 -unset bar;360,25856 -export LOADEDMODULES;366,26025 -MODULEPATH=367,26047 -export MODULEPATH;368,26092 -_LMFILES_=369,26111 -export _LMFILES_;370,26167 -_ModuleTable_=371,26185 -export _ModuleTable_;372,26531 -bar=373,26553 -export bar;374,26562 -export LOADEDMODULES;380,26736 -MODULEPATH=381,26758 -export MODULEPATH;382,26803 -_LMFILES_=383,26822 -export _LMFILES_;384,26923 -_ModuleTable_=385,26941 -export _ModuleTable_;386,27451 -export MODULEPATH;392,27645 -_ModuleTable_=393,27664 -export _ModuleTable_;394,28174 -MODULEPATH=400,28345 -export MODULEPATH;401,28390 -unset _LMFILES_;402,28409 -_ModuleTable_=403,28426 -export _ModuleTable_;404,28594 -unset bar;405,28616 -export LOADEDMODULES;411,28846 -__LMOD_REF_COUNT_MODULEPATH=412,28868 -export __LMOD_REF_COUNT_MODULEPATH;413,28933 -MODULEPATH=414,28969 -export MODULEPATH;415,29015 -_LMFILES_=416,29034 -export _LMFILES_;417,29209 -_ModuleTable_=418,29227 -export _ModuleTable_;419,30042 -export MODULEPATH;425,30237 -_ModuleTable_=426,30256 -export _ModuleTable_;427,31071 -MODULEPATH=433,31242 -export MODULEPATH;434,31288 -unset _LMFILES_;435,31307 -_ModuleTable_=436,31324 -export _ModuleTable_;437,31494 -export LOADEDMODULES;443,31672 -__LMOD_REF_COUNT_MODULEPATH=444,31694 -export __LMOD_REF_COUNT_MODULEPATH;445,31759 -MODULEPATH=446,31795 -export MODULEPATH;447,31841 -_LMFILES_=448,31860 -export _LMFILES_;449,31959 -_ModuleTable_=450,31977 -export _ModuleTable_;451,32477 -export MODULEPATH;457,32672 -_ModuleTable_=458,32691 -export _ModuleTable_;459,33191 -MODULEPATH=465,33362 -export MODULEPATH;466,33408 -unset _LMFILES_;467,33427 -_ModuleTable_=468,33444 -export _ModuleTable_;469,33614 -export LOADEDMODULES;475,33804 -__LMOD_REF_COUNT_MODULEPATH=476,33826 -export __LMOD_REF_COUNT_MODULEPATH;477,33891 -MODULEPATH=478,33927 -export MODULEPATH;479,33973 -MY_VERSION=480,33992 -export MY_VERSION;481,34010 -_LMFILES_=482,34029 -export _LMFILES_;483,34091 -_ModuleTable_=484,34109 -export _ModuleTable_;485,34486 -export LOADEDMODULES;491,34695 -MODULEPATH=492,34717 -export MODULEPATH;493,34763 -_LMFILES_=494,34782 -export _LMFILES_;495,34898 -_ModuleTable_=496,34916 -export _ModuleTable_;497,35495 -export MODULEPATH;503,35690 -_ModuleTable_=504,35709 -export _ModuleTable_;505,36288 -MODULEPATH=511,36459 -export MODULEPATH;512,36505 -unset MY_VERSION;513,36524 -unset _LMFILES_;514,36542 -_ModuleTable_=515,36559 -export _ModuleTable_;516,36729 -export __LMOD_REF_COUNT_MODULEPATH;522,37017 -MODULEPATH=523,37053 -export MODULEPATH;524,37135 -_ModuleTable_=525,37154 -export _ModuleTable_;526,37362 -export LOADEDMODULES;532,37560 -__LMOD_REF_COUNT_MODULEPATH=533,37582 -export __LMOD_REF_COUNT_MODULEPATH;534,37734 -MODULEPATH=535,37770 -export MODULEPATH;536,37897 -_LMFILES_=537,37916 -export _LMFILES_;538,38038 -_ModuleTable_=539,38056 -export _ModuleTable_;540,38694 -__LMOD_REF_COUNT_MODULEPATH=551,39007 -export __LMOD_REF_COUNT_MODULEPATH;552,39111 -MODULEPATH=553,39147 -export MODULEPATH;554,39229 -unset _LMFILES_;555,39248 -_ModuleTable_=556,39265 -export _ModuleTable_;557,39473 -export LMOD_FAMILY_COMPILER;563,39674 -LMOD_FAMILY_COMPILER_VERSION=564,39703 -export LMOD_FAMILY_COMPILER_VERSION;565,39737 -LOADEDMODULES=566,39774 -export LOADEDMODULES;567,39831 -__LMOD_REF_COUNT_MODULEPATH=568,39853 -export __LMOD_REF_COUNT_MODULEPATH;569,39977 -MODULEPATH=570,40013 -export MODULEPATH;571,40115 -_LMFILES_=572,40134 -export _LMFILES_;573,40337 -_ModuleTable_=574,40355 -export _ModuleTable_;575,41228 -export LOADEDMODULES;581,41417 -MODULEPATH=582,41439 -export MODULEPATH;583,41541 -_LMFILES_=584,41560 -export _LMFILES_;585,41632 -_ModuleTable_=586,41650 -export _ModuleTable_;587,42109 -export LOADEDMODULES;593,42323 -MODULEPATH=594,42345 -export MODULEPATH;595,42447 -_LMFILES_=596,42466 -export _LMFILES_;597,42669 -_ModuleTable_=598,42687 -export _ModuleTable_;599,43560 -export LMOD_FAMILY_COMPILER;605,43753 -LMOD_FAMILY_COMPILER_VERSION=606,43782 -export LMOD_FAMILY_COMPILER_VERSION;607,43816 -LOADEDMODULES=608,43853 -export LOADEDMODULES;609,43910 -__LMOD_REF_COUNT_MODULEPATH=610,43932 -export __LMOD_REF_COUNT_MODULEPATH;611,44056 -MODULEPATH=612,44092 -export MODULEPATH;613,44194 -_LMFILES_=614,44213 -export _LMFILES_;615,44416 -_ModuleTable_=616,44434 -export _ModuleTable_;617,45307 -export LOADEDMODULES;623,45496 -MODULEPATH=624,45518 -export MODULEPATH;625,45620 -_LMFILES_=626,45639 -export _LMFILES_;627,45711 -_ModuleTable_=628,45729 -export _ModuleTable_;629,46188 -export MODULEPATH;635,46439 -_ModuleTable_=636,46458 -export _ModuleTable_;637,46917 -unset LMOD_FAMILY_COMPILER_VERSION;643,47095 -unset LOADEDMODULES;644,47131 -__LMOD_REF_COUNT_MODULEPATH=645,47152 -export __LMOD_REF_COUNT_MODULEPATH;646,47225 -MODULEPATH=647,47261 -export MODULEPATH;648,47315 -unset _LMFILES_;649,47334 -_ModuleTable_=650,47351 -export _ModuleTable_;651,47537 -export LMOD_FAMILY_COMPILER;657,47743 -LMOD_FAMILY_COMPILER_VERSION=658,47772 -export LMOD_FAMILY_COMPILER_VERSION;659,47806 -LOADEDMODULES=660,47843 -export LOADEDMODULES;661,47909 -__LMOD_REF_COUNT_MODULEPATH=662,47931 -export __LMOD_REF_COUNT_MODULEPATH;663,48055 -MODULEPATH=664,48091 -export MODULEPATH;665,48193 -_LMFILES_=666,48212 -export _LMFILES_;667,48476 -_ModuleTable_=668,48494 -export _ModuleTable_;669,49550 -unset LMOD_FAMILY_COMPILER_VERSION;675,49740 -unset LOADEDMODULES;676,49776 -__LMOD_REF_COUNT_MODULEPATH=677,49797 -export __LMOD_REF_COUNT_MODULEPATH;678,49870 -MODULEPATH=679,49906 -export MODULEPATH;680,49960 -unset _LMFILES_;681,49979 -_ModuleTable_=682,49996 -export _ModuleTable_;683,50788 -export LMOD_FAMILY_COMPILER;689,50981 -LMOD_FAMILY_COMPILER_VERSION=690,51010 -export LMOD_FAMILY_COMPILER_VERSION;691,51044 -LOADEDMODULES=692,51081 -export LOADEDMODULES;693,51147 -__LMOD_REF_COUNT_MODULEPATH=694,51169 -export __LMOD_REF_COUNT_MODULEPATH;695,51293 -MODULEPATH=696,51329 -export MODULEPATH;697,51431 -_LMFILES_=698,51450 -export _LMFILES_;699,51714 -_ModuleTable_=700,51732 -export _ModuleTable_;701,52788 -export LOADEDMODULES;707,53001 -MODULEPATH=708,53023 -export MODULEPATH;709,53125 -_LMFILES_=710,53144 -export _LMFILES_;711,53344 -_ModuleTable_=712,53362 -export _ModuleTable_;713,54223 -export MODULEPATH;719,54474 -_ModuleTable_=720,54493 -export _ModuleTable_;721,55354 -export LOADEDMODULES;727,55540 -MODULEPATH=728,55562 -export MODULEPATH;729,55664 -_LMFILES_=730,55683 -export _LMFILES_;731,55755 -_ModuleTable_=732,55773 -export _ModuleTable_;733,56232 -export MODULEPATH;739,56483 -_ModuleTable_=740,56502 -export _ModuleTable_;741,56961 -unset LMOD_FAMILY_COMPILER_VERSION;747,57139 -unset LOADEDMODULES;748,57175 -__LMOD_REF_COUNT_MODULEPATH=749,57196 -export __LMOD_REF_COUNT_MODULEPATH;750,57269 -MODULEPATH=751,57305 -export MODULEPATH;752,57359 -unset _LMFILES_;753,57378 -_ModuleTable_=754,57395 -export _ModuleTable_;755,57581 -export LOADEDMODULES;761,57765 -MODULEPATH=762,57787 -export MODULEPATH;763,57841 -_LMFILES_=764,57860 -export _LMFILES_;765,57981 -_ModuleTable_=766,57999 -export _ModuleTable_;767,58551 -my_python=768,58573 -export my_python;769,58588 -export MODULEPATH;775,58787 -_ModuleTable_=776,58806 -export _ModuleTable_;777,59358 -export LMOD_FAMILY_COMPILER;783,59537 -LMOD_FAMILY_COMPILER_VERSION=784,59566 -export LMOD_FAMILY_COMPILER_VERSION;785,59600 -LOADEDMODULES=786,59637 -export LOADEDMODULES;787,59678 -__LMOD_REF_COUNT_MODULEPATH=788,59700 -export __LMOD_REF_COUNT_MODULEPATH;789,59817 -MODULEPATH=790,59853 -export MODULEPATH;791,59948 -_LMFILES_=792,59967 -export _LMFILES_;793,60141 -_ModuleTable_=794,60159 -export _ModuleTable_;795,60941 -my_python=796,60963 -export my_python;797,60978 -export MODULEPATH;803,61216 -_ModuleTable_=804,61235 -export _ModuleTable_;805,62017 -export MODULEPATH;811,62261 -_ModuleTable_=812,62280 -export _ModuleTable_;813,63062 -export LMOD_FAMILY_COMPILER;819,63245 -LMOD_FAMILY_COMPILER_VERSION=820,63274 -export LMOD_FAMILY_COMPILER_VERSION;821,63308 -LOADEDMODULES=822,63345 -export LOADEDMODULES;823,63388 -__LMOD_REF_COUNT_MODULEPATH=824,63410 -export __LMOD_REF_COUNT_MODULEPATH;825,63529 -MODULEPATH=826,63565 -export MODULEPATH;827,63662 -_LMFILES_=828,63681 -export _LMFILES_;829,63859 -_ModuleTable_=830,63877 -export _ModuleTable_;831,64673 -my_python=832,64695 -export my_python;833,64710 -export MODULEPATH;839,64952 -_ModuleTable_=840,64971 -export _ModuleTable_;841,65767 +export _LMFILES_;16,592 +_ModuleTable_=17,610 +export _ModuleTable_;18,1206 +export MODULEPATH;24,1399 +_ModuleTable_=25,1418 +export _ModuleTable_;26,2014 +export LOADEDMODULES;32,2183 +MODULEPATH=33,2205 +export MODULEPATH;34,2250 +_LMFILES_=35,2269 +export _LMFILES_;36,2319 +_ModuleTable_=37,2337 +export _ModuleTable_;38,2645 +export MODULEPATH;44,2838 +_ModuleTable_=45,2857 +export _ModuleTable_;46,3165 +MODULEPATH=52,3338 +export MODULEPATH;53,3383 +unset _LMFILES_;54,3402 +_ModuleTable_=55,3419 +export _ModuleTable_;56,3587 +export LOADEDMODULES;62,3762 +MODULEPATH=63,3784 +export MODULEPATH;64,3829 +_LMFILES_=65,3848 +export _LMFILES_;66,4011 +_ModuleTable_=67,4029 +export _ModuleTable_;68,4777 +export MODULEPATH;74,4970 +_ModuleTable_=75,4989 +export _ModuleTable_;76,5737 +export MODULEPATH;82,5930 +_ModuleTable_=83,5949 +export _ModuleTable_;84,6697 +export LOADEDMODULES;90,6869 +MODULEPATH=91,6891 +export MODULEPATH;92,6936 +_LMFILES_=93,6955 +export _LMFILES_;94,7044 +_ModuleTable_=95,7062 +export _ModuleTable_;96,7522 +export MODULEPATH;102,7716 +_ModuleTable_=103,7735 +export _ModuleTable_;104,8195 +MODULEPATH=110,8369 +export MODULEPATH;111,8414 +unset _LMFILES_;112,8433 +_ModuleTable_=113,8450 +export _ModuleTable_;114,8618 +export MODULEPATH;120,8812 +_ModuleTable_=121,8831 +export _ModuleTable_;122,8999 +export LOADEDMODULES;128,9171 +MODULEPATH=129,9193 +export MODULEPATH;130,9238 +_LMFILES_=131,9257 +export _LMFILES_;132,9381 +_ModuleTable_=133,9399 +export _ModuleTable_;134,10007 +export LOADEDMODULES;140,10179 +MODULEPATH=141,10201 +export MODULEPATH;142,10246 +_LMFILES_=143,10265 +export _LMFILES_;144,10350 +_ModuleTable_=145,10368 +export _ModuleTable_;146,10824 +export LOADEDMODULES;152,10999 +MODULEPATH=153,11021 +export MODULEPATH;154,11066 +_LMFILES_=155,11085 +export _LMFILES_;156,11248 +_ModuleTable_=157,11266 +export _ModuleTable_;158,12014 +__LMOD_DEFAULT_MODULES_LOADED__=159,12036 +export __LMOD_DEFAULT_MODULES_LOADED__;160,12071 +export LOADEDMODULES;166,12263 +MODULEPATH=167,12285 +export MODULEPATH;168,12330 +_LMFILES_=169,12349 +export _LMFILES_;170,12473 +_ModuleTable_=171,12491 +export _ModuleTable_;172,13087 +MODULEPATH=178,13258 +export MODULEPATH;179,13303 +unset _LMFILES_;180,13322 +_ModuleTable_=181,13339 +export _ModuleTable_;182,13507 +export LOADEDMODULES;188,13677 +MODULEPATH=189,13699 +export MODULEPATH;190,13744 +_LMFILES_=191,13763 +export _LMFILES_;192,13852 +_ModuleTable_=193,13870 +export _ModuleTable_;194,14330 +export MODULEPATH;200,14524 +_ModuleTable_=201,14543 +export _ModuleTable_;202,15003 +export MODULEPATH;208,15197 +_ModuleTable_=209,15216 +export _ModuleTable_;210,15676 +export MODULEPATH;216,15873 +_ModuleTable_=217,15892 +export _ModuleTable_;218,16352 +__LMOD_DEFAULT_MODULES_LOADED__=219,16374 +export __LMOD_DEFAULT_MODULES_LOADED__;220,16409 +MODULEPATH=226,16601 +export MODULEPATH;227,16646 +unset _LMFILES_;228,16665 +_ModuleTable_=229,16682 +export _ModuleTable_;230,16850 +export MODULEPATH;236,17044 +_ModuleTable_=237,17063 +export _ModuleTable_;238,17231 +export MODULEPATH;244,17426 +_ModuleTable_=245,17445 +export _ModuleTable_;246,17613 +export LOADEDMODULES;252,17789 +MODULEPATH=253,17811 +export MODULEPATH;254,17856 +_LMFILES_=255,17875 +export _LMFILES_;256,18038 +_ModuleTable_=257,18056 +export _ModuleTable_;258,18804 +export MODULEPATH;264,18998 +_ModuleTable_=265,19017 +export _ModuleTable_;266,19765 +MODULEPATH=272,19936 +export MODULEPATH;273,19981 +unset _LMFILES_;274,20000 +_ModuleTable_=275,20017 +export _ModuleTable_;276,20185 +export LOADEDMODULES;282,20360 +MODULEPATH=283,20382 +export MODULEPATH;284,20427 +_LMFILES_=285,20446 +export _LMFILES_;286,20609 +_ModuleTable_=287,20627 +export _ModuleTable_;288,21375 +__LMOD_DEFAULT_MODULES_LOADED__=289,21397 +export __LMOD_DEFAULT_MODULES_LOADED__;290,21432 +export MODULEPATH;296,21644 +_ModuleTable_=297,21663 +export _ModuleTable_;298,22411 +MODULEPATH=304,22582 +export MODULEPATH;305,22627 +unset _LMFILES_;306,22646 +_ModuleTable_=307,22663 +export _ModuleTable_;308,22831 +export LOADEDMODULES;319,23146 +MODULEPATH=320,23168 +export MODULEPATH;321,23213 +_LMFILES_=322,23232 +export _LMFILES_;323,23288 +_ModuleTable_=324,23306 +export _ModuleTable_;325,23642 +bar=326,23664 +export bar;327,23673 +export LOADEDMODULES;333,23847 +MODULEPATH=334,23869 +export MODULEPATH;335,23914 +_LMFILES_=336,23933 +export _LMFILES_;337,24034 +_ModuleTable_=338,24052 +export _ModuleTable_;339,24574 +bar=340,24596 +export bar;341,24605 +export MODULEPATH;347,24789 +_ModuleTable_=348,24808 +export _ModuleTable_;349,25330 +MODULEPATH=355,25501 +export MODULEPATH;356,25546 +unset _LMFILES_;357,25565 +_ModuleTable_=358,25582 +export _ModuleTable_;359,25750 +unset bar;360,25772 +export LOADEDMODULES;366,25941 +MODULEPATH=367,25963 +export MODULEPATH;368,26008 +_LMFILES_=369,26027 +export _LMFILES_;370,26083 +_ModuleTable_=371,26101 +export _ModuleTable_;372,26447 +bar=373,26469 +export bar;374,26478 +export LOADEDMODULES;380,26652 +MODULEPATH=381,26674 +export MODULEPATH;382,26719 +_LMFILES_=383,26738 +export _LMFILES_;384,26839 +_ModuleTable_=385,26857 +export _ModuleTable_;386,27367 +export MODULEPATH;392,27561 +_ModuleTable_=393,27580 +export _ModuleTable_;394,28090 +MODULEPATH=400,28261 +export MODULEPATH;401,28306 +unset _LMFILES_;402,28325 +_ModuleTable_=403,28342 +export _ModuleTable_;404,28510 +unset bar;405,28532 +export LOADEDMODULES;411,28762 +__LMOD_REF_COUNT_MODULEPATH=412,28784 +export __LMOD_REF_COUNT_MODULEPATH;413,28849 +MODULEPATH=414,28885 +export MODULEPATH;415,28931 +_LMFILES_=416,28950 +export _LMFILES_;417,29125 +_ModuleTable_=418,29143 +export _ModuleTable_;419,29958 +export MODULEPATH;425,30153 +_ModuleTable_=426,30172 +export _ModuleTable_;427,30987 +MODULEPATH=433,31158 +export MODULEPATH;434,31204 +unset _LMFILES_;435,31223 +_ModuleTable_=436,31240 +export _ModuleTable_;437,31410 +export LOADEDMODULES;443,31588 +__LMOD_REF_COUNT_MODULEPATH=444,31610 +export __LMOD_REF_COUNT_MODULEPATH;445,31675 +MODULEPATH=446,31711 +export MODULEPATH;447,31757 +_LMFILES_=448,31776 +export _LMFILES_;449,31875 +_ModuleTable_=450,31893 +export _ModuleTable_;451,32393 +export MODULEPATH;457,32588 +_ModuleTable_=458,32607 +export _ModuleTable_;459,33107 +MODULEPATH=465,33278 +export MODULEPATH;466,33324 +unset _LMFILES_;467,33343 +_ModuleTable_=468,33360 +export _ModuleTable_;469,33530 +export LOADEDMODULES;475,33720 +__LMOD_REF_COUNT_MODULEPATH=476,33742 +export __LMOD_REF_COUNT_MODULEPATH;477,33807 +MODULEPATH=478,33843 +export MODULEPATH;479,33889 +MY_VERSION=480,33908 +export MY_VERSION;481,33926 +_LMFILES_=482,33945 +export _LMFILES_;483,34007 +_ModuleTable_=484,34025 +export _ModuleTable_;485,34402 +export LOADEDMODULES;491,34611 +MODULEPATH=492,34633 +export MODULEPATH;493,34679 +_LMFILES_=494,34698 +export _LMFILES_;495,34814 +_ModuleTable_=496,34832 +export _ModuleTable_;497,35411 +export MODULEPATH;503,35606 +_ModuleTable_=504,35625 +export _ModuleTable_;505,36204 +MODULEPATH=511,36375 +export MODULEPATH;512,36421 +unset MY_VERSION;513,36440 +unset _LMFILES_;514,36458 +_ModuleTable_=515,36475 +export _ModuleTable_;516,36645 +export __LMOD_REF_COUNT_MODULEPATH;522,36933 +MODULEPATH=523,36969 +export MODULEPATH;524,37051 +_ModuleTable_=525,37070 +export _ModuleTable_;526,37278 +export LOADEDMODULES;532,37476 +__LMOD_REF_COUNT_MODULEPATH=533,37498 +export __LMOD_REF_COUNT_MODULEPATH;534,37650 +MODULEPATH=535,37686 +export MODULEPATH;536,37813 +_LMFILES_=537,37832 +export _LMFILES_;538,37954 +_ModuleTable_=539,37972 +export _ModuleTable_;540,38701 +__LMOD_REF_COUNT_MODULEPATH=551,39014 +export __LMOD_REF_COUNT_MODULEPATH;552,39118 +MODULEPATH=553,39154 +export MODULEPATH;554,39236 +unset _LMFILES_;555,39255 +_ModuleTable_=556,39272 +export _ModuleTable_;557,39480 +export LMOD_FAMILY_COMPILER;563,39681 +LMOD_FAMILY_COMPILER_VERSION=564,39710 +export LMOD_FAMILY_COMPILER_VERSION;565,39744 +LOADEDMODULES=566,39781 +export LOADEDMODULES;567,39838 +__LMOD_REF_COUNT_MODULEPATH=568,39860 +export __LMOD_REF_COUNT_MODULEPATH;569,39984 +MODULEPATH=570,40020 +export MODULEPATH;571,40122 +_LMFILES_=572,40141 +export _LMFILES_;573,40344 +_ModuleTable_=574,40362 +export _ModuleTable_;575,41329 +export LOADEDMODULES;581,41518 +MODULEPATH=582,41540 +export MODULEPATH;583,41642 +_LMFILES_=584,41661 +export _LMFILES_;585,41733 +_ModuleTable_=586,41751 +export _ModuleTable_;587,42304 +export LOADEDMODULES;593,42518 +MODULEPATH=594,42540 +export MODULEPATH;595,42642 +_LMFILES_=596,42661 +export _LMFILES_;597,42864 +_ModuleTable_=598,42882 +export _ModuleTable_;599,43849 +export LMOD_FAMILY_COMPILER;605,44042 +LMOD_FAMILY_COMPILER_VERSION=606,44071 +export LMOD_FAMILY_COMPILER_VERSION;607,44105 +LOADEDMODULES=608,44142 +export LOADEDMODULES;609,44199 +__LMOD_REF_COUNT_MODULEPATH=610,44221 +export __LMOD_REF_COUNT_MODULEPATH;611,44345 +MODULEPATH=612,44381 +export MODULEPATH;613,44483 +_LMFILES_=614,44502 +export _LMFILES_;615,44705 +_ModuleTable_=616,44723 +export _ModuleTable_;617,45690 +export LOADEDMODULES;623,45879 +MODULEPATH=624,45901 +export MODULEPATH;625,46003 +_LMFILES_=626,46022 +export _LMFILES_;627,46094 +_ModuleTable_=628,46112 +export _ModuleTable_;629,46665 +export MODULEPATH;635,46916 +_ModuleTable_=636,46935 +export _ModuleTable_;637,47488 +unset LMOD_FAMILY_COMPILER_VERSION;643,47666 +unset LOADEDMODULES;644,47702 +__LMOD_REF_COUNT_MODULEPATH=645,47723 +export __LMOD_REF_COUNT_MODULEPATH;646,47796 +MODULEPATH=647,47832 +export MODULEPATH;648,47886 +unset _LMFILES_;649,47905 +_ModuleTable_=650,47922 +export _ModuleTable_;651,48108 +export LMOD_FAMILY_COMPILER;657,48314 +LMOD_FAMILY_COMPILER_VERSION=658,48343 +export LMOD_FAMILY_COMPILER_VERSION;659,48377 +LOADEDMODULES=660,48414 +export LOADEDMODULES;661,48480 +__LMOD_REF_COUNT_MODULEPATH=662,48502 +export __LMOD_REF_COUNT_MODULEPATH;663,48626 +MODULEPATH=664,48662 +export MODULEPATH;665,48764 +_LMFILES_=666,48783 +export _LMFILES_;667,49047 +_ModuleTable_=668,49065 +export _ModuleTable_;669,50215 +unset LMOD_FAMILY_COMPILER_VERSION;675,50405 +unset LOADEDMODULES;676,50441 +__LMOD_REF_COUNT_MODULEPATH=677,50462 +export __LMOD_REF_COUNT_MODULEPATH;678,50535 +MODULEPATH=679,50571 +export MODULEPATH;680,50625 +unset _LMFILES_;681,50644 +_ModuleTable_=682,50661 +export _ModuleTable_;683,51453 +export LMOD_FAMILY_COMPILER;689,51646 +LMOD_FAMILY_COMPILER_VERSION=690,51675 +export LMOD_FAMILY_COMPILER_VERSION;691,51709 +LOADEDMODULES=692,51746 +export LOADEDMODULES;693,51812 +__LMOD_REF_COUNT_MODULEPATH=694,51834 +export __LMOD_REF_COUNT_MODULEPATH;695,51958 +MODULEPATH=696,51994 +export MODULEPATH;697,52096 +_LMFILES_=698,52115 +export _LMFILES_;699,52379 +_ModuleTable_=700,52397 +export _ModuleTable_;701,53547 +export LOADEDMODULES;707,53760 +MODULEPATH=708,53782 +export MODULEPATH;709,53884 +_LMFILES_=710,53903 +export _LMFILES_;711,54103 +_ModuleTable_=712,54121 +export _ModuleTable_;713,55076 +export MODULEPATH;719,55327 +_ModuleTable_=720,55346 +export _ModuleTable_;721,56301 +export LOADEDMODULES;727,56487 +MODULEPATH=728,56509 +export MODULEPATH;729,56611 +_LMFILES_=730,56630 +export _LMFILES_;731,56702 +_ModuleTable_=732,56720 +export _ModuleTable_;733,57273 +export MODULEPATH;739,57524 +_ModuleTable_=740,57543 +export _ModuleTable_;741,58096 +unset LMOD_FAMILY_COMPILER_VERSION;747,58274 +unset LOADEDMODULES;748,58310 +__LMOD_REF_COUNT_MODULEPATH=749,58331 +export __LMOD_REF_COUNT_MODULEPATH;750,58404 +MODULEPATH=751,58440 +export MODULEPATH;752,58494 +unset _LMFILES_;753,58513 +_ModuleTable_=754,58530 +export _ModuleTable_;755,58716 +export LOADEDMODULES;761,58900 +MODULEPATH=762,58922 +export MODULEPATH;763,58976 +_LMFILES_=764,58995 +export _LMFILES_;765,59116 +_ModuleTable_=766,59134 +export _ModuleTable_;767,59686 +my_python=768,59708 +export my_python;769,59723 +export MODULEPATH;775,59922 +_ModuleTable_=776,59941 +export _ModuleTable_;777,60493 +export LMOD_FAMILY_COMPILER;783,60672 +LMOD_FAMILY_COMPILER_VERSION=784,60701 +export LMOD_FAMILY_COMPILER_VERSION;785,60735 +LOADEDMODULES=786,60772 +export LOADEDMODULES;787,60813 +__LMOD_REF_COUNT_MODULEPATH=788,60835 +export __LMOD_REF_COUNT_MODULEPATH;789,60952 +MODULEPATH=790,60988 +export MODULEPATH;791,61083 +_LMFILES_=792,61102 +export _LMFILES_;793,61276 +_ModuleTable_=794,61294 +export _ModuleTable_;795,62163 +my_python=796,62185 +export my_python;797,62200 +export MODULEPATH;803,62438 +_ModuleTable_=804,62457 +export _ModuleTable_;805,63326 +export MODULEPATH;811,63570 +_ModuleTable_=812,63589 +export _ModuleTable_;813,64458 +export LMOD_FAMILY_COMPILER;819,64641 +LMOD_FAMILY_COMPILER_VERSION=820,64670 +export LMOD_FAMILY_COMPILER_VERSION;821,64704 +LOADEDMODULES=822,64741 +export LOADEDMODULES;823,64784 +__LMOD_REF_COUNT_MODULEPATH=824,64806 +export __LMOD_REF_COUNT_MODULEPATH;825,64925 +MODULEPATH=826,64961 +export MODULEPATH;827,65058 +_LMFILES_=828,65077 +export _LMFILES_;829,65255 +_ModuleTable_=830,65273 +export _ModuleTable_;831,66158 +my_python=832,66180 +export my_python;833,66195 +export MODULEPATH;839,66437 +_ModuleTable_=840,66456 +export _ModuleTable_;841,67341 rt/depends_on/err.txt,196 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule169,5360 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule276,9130 +Also make sure that all modulefiles written in TCL start with the string #%ModuleModule169,5359 +Also make sure that all modulefiles written in TCL start with the string #%ModuleModule276,9129 rt/prereq/out.txt,2296 export LOADEDMODULES;10,290 @@ -2953,7 +2951,7 @@ local testName 2,15 rt/tamu/mf/README.tamusc,33 This is the root of the new 1,0 -rt/tamu/out.txt,1493 +rt/tamu/out.txt,1494 export __LMOD_REF_COUNT_MODULEPATH;10,317 MODULEPATH=11,353 export MODULEPATH;12,392 @@ -2971,42 +2969,42 @@ export MODULEPATH;28,1108 _LMFILES_=29,1127 export _LMFILES_;30,1177 _ModuleTable_=31,1195 -export _ModuleTable_;32,1569 -export MODULEPATH;38,1796 -_ModuleTable_=39,1815 -export _ModuleTable_;40,2189 -export LMOD_FAMILY_MPI;46,2364 -LMOD_FAMILY_MPI_VERSION=47,2388 -export LMOD_FAMILY_MPI_VERSION;48,2417 -LOADEDMODULES=49,2449 -export LOADEDMODULES;50,2481 -__LMOD_REF_COUNT_MODULEPATH=51,2503 -export __LMOD_REF_COUNT_MODULEPATH;52,2649 -MODULEPATH=53,2685 -export MODULEPATH;54,2806 -_LMFILES_=55,2825 -export _LMFILES_;56,2927 -_ModuleTable_=57,2945 -export _ModuleTable_;58,3559 -export MODULEPATH;64,3829 -_ModuleTable_=65,3848 -export _ModuleTable_;66,4462 -export LOADEDMODULES;72,4660 -MODULEPATH=73,4682 -export MODULEPATH;74,4803 -_LMFILES_=75,4822 -export _LMFILES_;76,4984 -_ModuleTable_=77,5002 -export _ModuleTable_;78,5832 -export MODULEPATH;84,6102 -_ModuleTable_=85,6121 -export _ModuleTable_;86,6951 -export MODULEPATH;92,7227 -_ModuleTable_=93,7246 -export _ModuleTable_;94,8076 -export MODULEPATH;100,8361 -_ModuleTable_=101,8380 -export _ModuleTable_;102,9210 +export _ModuleTable_;32,1654 +export MODULEPATH;38,1881 +_ModuleTable_=39,1900 +export _ModuleTable_;40,2359 +export LMOD_FAMILY_MPI;46,2534 +LMOD_FAMILY_MPI_VERSION=47,2558 +export LMOD_FAMILY_MPI_VERSION;48,2587 +LOADEDMODULES=49,2619 +export LOADEDMODULES;50,2651 +__LMOD_REF_COUNT_MODULEPATH=51,2673 +export __LMOD_REF_COUNT_MODULEPATH;52,2819 +MODULEPATH=53,2855 +export MODULEPATH;54,2976 +_LMFILES_=55,2995 +export _LMFILES_;56,3097 +_ModuleTable_=57,3115 +export _ModuleTable_;58,3903 +export MODULEPATH;64,4173 +_ModuleTable_=65,4192 +export _ModuleTable_;66,4980 +export LOADEDMODULES;72,5178 +MODULEPATH=73,5200 +export MODULEPATH;74,5321 +_LMFILES_=75,5340 +export _LMFILES_;76,5502 +_ModuleTable_=77,5520 +export _ModuleTable_;78,6524 +export MODULEPATH;84,6794 +_ModuleTable_=85,6813 +export _ModuleTable_;86,7817 +export MODULEPATH;92,8093 +_ModuleTable_=93,8112 +export _ModuleTable_;94,9116 +export MODULEPATH;100,9401 +_ModuleTable_=101,9420 +export _ModuleTable_;102,10424 rt/tamu/SitePackage.lua,82 function prereq_version(6,143 @@ -3089,7 +3087,7 @@ export _ModuleTable_;122,7491 rt/set_alias/set_alias.tdesc,19 testdescript 2,15 -rt/reset/out.txt,6338 +rt/reset/out.txt,6341 export ADMIN_MODULE_LOADED;10,310 __LMOD_REF_COUNT_INFOPATH=11,338 export __LMOD_REF_COUNT_INFOPATH;12,398 @@ -3140,167 +3138,167 @@ export TACC_PMETIS_LIB;56,3379 _LMFILES_=57,3403 export _LMFILES_;58,3805 _ModuleTable_=59,3823 -export _ModuleTable_;60,5587 -unset __LMOD_REF_COUNT_INFOPATH;66,5763 -unset INFOPATH;67,5796 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;68,5812 -unset LD_LIBRARY_PATH;69,5852 -unset LMOD_FAMILY_COMPILER;70,5875 -unset LMOD_FAMILY_COMPILER_VERSION;71,5903 -unset LMOD_FAMILY_MPI;72,5939 -unset LMOD_FAMILY_MPI_VERSION;73,5962 -unset LOADEDMODULES;74,5993 -unset __LMOD_REF_COUNT_MANPATH;75,6014 -unset MANPATH;76,6046 -unset MKL_DIR;77,6061 -unset MKL_INCLUDE;78,6076 -__LMOD_REF_COUNT_MODULEPATH=79,6095 -export __LMOD_REF_COUNT_MODULEPATH;80,6154 -MODULEPATH=81,6190 -export MODULEPATH;82,6230 -unset MPIHOME;83,6249 -__LMOD_REF_COUNT_PATH=84,6264 -export __LMOD_REF_COUNT_PATH;85,6324 -PATH=86,6354 -export PATH;87,6392 -unset TACC_PMETIS_BIN;88,6405 -unset TACC_PMETIS_DIR;89,6428 -unset TACC_PMETIS_DOC;90,6451 -unset TACC_PMETIS_INC;91,6474 -unset TACC_PMETIS_LIB;92,6497 -unset _LMFILES_;93,6520 -_ModuleTable_=94,6537 -export _ModuleTable_;95,6695 -export MODULEPATH;101,6883 -_ModuleTable_=102,6902 -export _ModuleTable_;103,7060 -export ADMIN_MODULE_LOADED;109,7261 -__LMOD_REF_COUNT_INFOPATH=110,7289 -export __LMOD_REF_COUNT_INFOPATH;111,7349 -INFOPATH=112,7383 -export INFOPATH;113,7421 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=114,7438 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;115,7650 -LD_LIBRARY_PATH=116,7691 -export LD_LIBRARY_PATH;117,7872 -LMOD_FAMILY_COMPILER=118,7896 -export LMOD_FAMILY_COMPILER;119,7924 -LMOD_FAMILY_COMPILER_VERSION=120,7953 -export LMOD_FAMILY_COMPILER_VERSION;121,7989 -LMOD_FAMILY_MPI=122,8026 -export LMOD_FAMILY_MPI;123,8051 -LMOD_FAMILY_MPI_VERSION=124,8075 -export LMOD_FAMILY_MPI_VERSION;125,8106 -LOADEDMODULES=126,8138 -export LOADEDMODULES;127,8249 -__LMOD_REF_COUNT_MANPATH=128,8271 -export __LMOD_REF_COUNT_MANPATH;129,8519 -MANPATH=130,8552 -export MANPATH;131,8763 -MKL_DIR=132,8779 -export MKL_DIR;133,8821 -MKL_INCLUDE=134,8837 -export MKL_INCLUDE;135,8883 -__LMOD_REF_COUNT_MODULEPATH=136,8903 -export __LMOD_REF_COUNT_MODULEPATH;137,9063 -MODULEPATH=138,9099 -export MODULEPATH;139,9234 -MPIHOME=140,9253 -export MPIHOME;141,9306 -__LMOD_REF_COUNT_PATH=142,9322 -export __LMOD_REF_COUNT_PATH;143,9630 -PATH=144,9660 -export PATH;145,9919 -TACC_PMETIS_BIN=146,9932 -export TACC_PMETIS_BIN;147,9991 -TACC_PMETIS_DIR=148,10015 -export TACC_PMETIS_DIR;149,10074 -TACC_PMETIS_DOC=150,10098 -export TACC_PMETIS_DOC;151,10164 -TACC_PMETIS_INC=152,10188 -export TACC_PMETIS_INC;153,10247 -TACC_PMETIS_LIB=154,10271 -export TACC_PMETIS_LIB;155,10330 -_LMFILES_=156,10354 -export _LMFILES_;157,10756 -_ModuleTable_=158,10774 -export _ModuleTable_;159,12538 -export MODULEPATH;165,12821 -_ModuleTable_=166,12840 -export _ModuleTable_;167,14604 -export __LMOD_REF_COUNT_MODULEPATH;173,14970 -MODULEPATH=174,15006 -export MODULEPATH;175,15169 -_ModuleTable_=176,15188 -export _ModuleTable_;177,16982 -export __LMOD_REF_COUNT_MODULEPATH;183,17381 -MODULEPATH=184,17417 -export MODULEPATH;185,17609 -_ModuleTable_=186,17628 -export _ModuleTable_;187,19453 -export LOADEDMODULES;193,19724 -MODULEPATH=194,19746 -export MODULEPATH;195,19938 -MY_VERSION=196,19957 -export MY_VERSION;197,19973 -_LMFILES_=198,19992 -export _LMFILES_;199,20434 -_ModuleTable_=200,20452 -export _ModuleTable_;201,22436 -export MODULEPATH;207,22777 -_ModuleTable_=208,22796 -export _ModuleTable_;209,24780 -export ADMIN_MODULE_LOADED;215,24953 -unset __LMOD_REF_COUNT_INFOPATH;216,24981 -unset INFOPATH;217,25014 -LD_LIBRARY_PATH=218,25030 -export LD_LIBRARY_PATH;219,25211 -LMOD_FAMILY_COMPILER=220,25235 -export LMOD_FAMILY_COMPILER;221,25263 -LMOD_FAMILY_COMPILER_VERSION=222,25292 -export LMOD_FAMILY_COMPILER_VERSION;223,25328 -LMOD_FAMILY_MPI=224,25365 -export LMOD_FAMILY_MPI;225,25390 -LMOD_FAMILY_MPI_VERSION=226,25414 -export LMOD_FAMILY_MPI_VERSION;227,25445 -LOADEDMODULES=228,25477 -export LOADEDMODULES;229,25547 -__LMOD_REF_COUNT_MANPATH=230,25569 -export __LMOD_REF_COUNT_MANPATH;231,25769 -MANPATH=232,25802 -export MANPATH;233,25971 -MKL_DIR=234,25987 -export MKL_DIR;235,26029 -MKL_INCLUDE=236,26045 -export MKL_INCLUDE;237,26091 -__LMOD_REF_COUNT_MODULEPATH=238,26111 -export __LMOD_REF_COUNT_MODULEPATH;239,26271 -MODULEPATH=240,26307 -export MODULEPATH;241,26442 -MPIHOME=242,26461 -export MPIHOME;243,26514 -unset MY_VERSION;244,26530 -__LMOD_REF_COUNT_PATH=245,26548 -export __LMOD_REF_COUNT_PATH;246,26773 -PATH=247,26803 -export PATH;248,26988 -TACC_PMETIS_BIN=249,27001 -export TACC_PMETIS_BIN;250,27060 -TACC_PMETIS_DIR=251,27084 -export TACC_PMETIS_DIR;252,27143 -TACC_PMETIS_DOC=253,27167 -export TACC_PMETIS_DOC;254,27233 -TACC_PMETIS_INC=255,27257 -export TACC_PMETIS_INC;256,27316 -TACC_PMETIS_LIB=257,27340 -export TACC_PMETIS_LIB;258,27399 -_LMFILES_=259,27423 -export _LMFILES_;260,27656 -_ModuleTable_=261,27674 -export _ModuleTable_;262,28766 -export MODULEPATH;268,29050 -_ModuleTable_=269,29069 -export _ModuleTable_;270,30161 +export _ModuleTable_;60,5774 +unset __LMOD_REF_COUNT_INFOPATH;66,5950 +unset INFOPATH;67,5983 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;68,5999 +unset LD_LIBRARY_PATH;69,6039 +unset LMOD_FAMILY_COMPILER;70,6062 +unset LMOD_FAMILY_COMPILER_VERSION;71,6090 +unset LMOD_FAMILY_MPI;72,6126 +unset LMOD_FAMILY_MPI_VERSION;73,6149 +unset LOADEDMODULES;74,6180 +unset __LMOD_REF_COUNT_MANPATH;75,6201 +unset MANPATH;76,6233 +unset MKL_DIR;77,6248 +unset MKL_INCLUDE;78,6263 +__LMOD_REF_COUNT_MODULEPATH=79,6282 +export __LMOD_REF_COUNT_MODULEPATH;80,6341 +MODULEPATH=81,6377 +export MODULEPATH;82,6417 +unset MPIHOME;83,6436 +__LMOD_REF_COUNT_PATH=84,6451 +export __LMOD_REF_COUNT_PATH;85,6511 +PATH=86,6541 +export PATH;87,6579 +unset TACC_PMETIS_BIN;88,6592 +unset TACC_PMETIS_DIR;89,6615 +unset TACC_PMETIS_DOC;90,6638 +unset TACC_PMETIS_INC;91,6661 +unset TACC_PMETIS_LIB;92,6684 +unset _LMFILES_;93,6707 +_ModuleTable_=94,6724 +export _ModuleTable_;95,6882 +export MODULEPATH;101,7070 +_ModuleTable_=102,7089 +export _ModuleTable_;103,7247 +export ADMIN_MODULE_LOADED;109,7448 +__LMOD_REF_COUNT_INFOPATH=110,7476 +export __LMOD_REF_COUNT_INFOPATH;111,7536 +INFOPATH=112,7570 +export INFOPATH;113,7608 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=114,7625 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;115,7837 +LD_LIBRARY_PATH=116,7878 +export LD_LIBRARY_PATH;117,8059 +LMOD_FAMILY_COMPILER=118,8083 +export LMOD_FAMILY_COMPILER;119,8111 +LMOD_FAMILY_COMPILER_VERSION=120,8140 +export LMOD_FAMILY_COMPILER_VERSION;121,8176 +LMOD_FAMILY_MPI=122,8213 +export LMOD_FAMILY_MPI;123,8238 +LMOD_FAMILY_MPI_VERSION=124,8262 +export LMOD_FAMILY_MPI_VERSION;125,8293 +LOADEDMODULES=126,8325 +export LOADEDMODULES;127,8436 +__LMOD_REF_COUNT_MANPATH=128,8458 +export __LMOD_REF_COUNT_MANPATH;129,8706 +MANPATH=130,8739 +export MANPATH;131,8950 +MKL_DIR=132,8966 +export MKL_DIR;133,9008 +MKL_INCLUDE=134,9024 +export MKL_INCLUDE;135,9070 +__LMOD_REF_COUNT_MODULEPATH=136,9090 +export __LMOD_REF_COUNT_MODULEPATH;137,9250 +MODULEPATH=138,9286 +export MODULEPATH;139,9421 +MPIHOME=140,9440 +export MPIHOME;141,9493 +__LMOD_REF_COUNT_PATH=142,9509 +export __LMOD_REF_COUNT_PATH;143,9817 +PATH=144,9847 +export PATH;145,10106 +TACC_PMETIS_BIN=146,10119 +export TACC_PMETIS_BIN;147,10178 +TACC_PMETIS_DIR=148,10202 +export TACC_PMETIS_DIR;149,10261 +TACC_PMETIS_DOC=150,10285 +export TACC_PMETIS_DOC;151,10351 +TACC_PMETIS_INC=152,10375 +export TACC_PMETIS_INC;153,10434 +TACC_PMETIS_LIB=154,10458 +export TACC_PMETIS_LIB;155,10517 +_LMFILES_=156,10541 +export _LMFILES_;157,10943 +_ModuleTable_=158,10961 +export _ModuleTable_;159,12912 +export MODULEPATH;165,13195 +_ModuleTable_=166,13214 +export _ModuleTable_;167,15165 +export __LMOD_REF_COUNT_MODULEPATH;173,15531 +MODULEPATH=174,15567 +export MODULEPATH;175,15730 +_ModuleTable_=176,15749 +export _ModuleTable_;177,17730 +export __LMOD_REF_COUNT_MODULEPATH;183,18129 +MODULEPATH=184,18165 +export MODULEPATH;185,18357 +_ModuleTable_=186,18376 +export _ModuleTable_;187,20388 +export LOADEDMODULES;193,20659 +MODULEPATH=194,20681 +export MODULEPATH;195,20873 +MY_VERSION=196,20892 +export MY_VERSION;197,20908 +_LMFILES_=198,20927 +export _LMFILES_;199,21369 +_ModuleTable_=200,21387 +export _ModuleTable_;201,23558 +export MODULEPATH;207,23899 +_ModuleTable_=208,23918 +export _ModuleTable_;209,26089 +export ADMIN_MODULE_LOADED;215,26262 +unset __LMOD_REF_COUNT_INFOPATH;216,26290 +unset INFOPATH;217,26323 +LD_LIBRARY_PATH=218,26339 +export LD_LIBRARY_PATH;219,26520 +LMOD_FAMILY_COMPILER=220,26544 +export LMOD_FAMILY_COMPILER;221,26572 +LMOD_FAMILY_COMPILER_VERSION=222,26601 +export LMOD_FAMILY_COMPILER_VERSION;223,26637 +LMOD_FAMILY_MPI=224,26674 +export LMOD_FAMILY_MPI;225,26699 +LMOD_FAMILY_MPI_VERSION=226,26723 +export LMOD_FAMILY_MPI_VERSION;227,26754 +LOADEDMODULES=228,26786 +export LOADEDMODULES;229,26856 +__LMOD_REF_COUNT_MANPATH=230,26878 +export __LMOD_REF_COUNT_MANPATH;231,27078 +MANPATH=232,27111 +export MANPATH;233,27280 +MKL_DIR=234,27296 +export MKL_DIR;235,27338 +MKL_INCLUDE=236,27354 +export MKL_INCLUDE;237,27400 +__LMOD_REF_COUNT_MODULEPATH=238,27420 +export __LMOD_REF_COUNT_MODULEPATH;239,27580 +MODULEPATH=240,27616 +export MODULEPATH;241,27751 +MPIHOME=242,27770 +export MPIHOME;243,27823 +unset MY_VERSION;244,27839 +__LMOD_REF_COUNT_PATH=245,27857 +export __LMOD_REF_COUNT_PATH;246,28082 +PATH=247,28112 +export PATH;248,28297 +TACC_PMETIS_BIN=249,28310 +export TACC_PMETIS_BIN;250,28369 +TACC_PMETIS_DIR=251,28393 +export TACC_PMETIS_DIR;252,28452 +TACC_PMETIS_DOC=253,28476 +export TACC_PMETIS_DOC;254,28542 +TACC_PMETIS_INC=255,28566 +export TACC_PMETIS_INC;256,28625 +TACC_PMETIS_LIB=257,28649 +export TACC_PMETIS_LIB;258,28708 +_LMFILES_=259,28732 +export _LMFILES_;260,28965 +_ModuleTable_=261,28983 +export _ModuleTable_;262,30262 +export MODULEPATH;268,30546 +_ModuleTable_=269,30565 +export _ModuleTable_;270,31844 rt/reset/reset.tdesc,19 testdescript 2,15 @@ -3367,7 +3365,7 @@ export _ModuleTable_;40,2034 rt/settarg/settarg.tdesc,21 local testName 2,15 -rt/settarg/out.txt,14232 +rt/settarg/out.txt,14238 export LMOD_SETTARG_CMD;10,321 LOADEDMODULES=11,346 export LOADEDMODULES;12,373 @@ -3508,367 +3506,367 @@ export PATH;180,6655 _LMFILES_=181,6668 export _LMFILES_;182,6815 _ModuleTable_=183,6833 -export _ModuleTable_;184,7708 -export PATH;190,7986 -TARG=191,7999 -export TARG;192,8042 -unset TARG_BUILD_SCENARIO;193,8055 -TARG_COMPILER=194,8082 -export TARG_COMPILER;195,8107 -TARG_COMPILER_FAMILY=196,8129 -export TARG_COMPILER_FAMILY;197,8155 -unset TARG_EXTRA;198,8184 -TARG_HOST=199,8202 -export TARG_HOST;200,8225 -TARG_MACH=201,8243 -export TARG_MACH;202,8263 -TARG_MACH_DESCRIPT=203,8281 -export TARG_MACH_DESCRIPT;204,8317 -TARG_MPI=205,8344 -export TARG_MPI;206,8366 -TARG_MPI_FAMILY=207,8383 -export TARG_MPI_FAMILY;208,8406 -TARG_OS=209,8430 -export TARG_OS;210,8449 -TARG_OS_FAMILY=211,8465 -export TARG_OS_FAMILY;212,8498 -TARG_SUMMARY=213,8521 -export TARG_SUMMARY;214,8566 -TARG_TITLE_BAR=215,8587 -export TARG_TITLE_BAR;216,8620 -TARG_TITLE_BAR_PAREN=217,8643 -export TARG_TITLE_BAR_PAREN;218,8686 -_SettargTable_=219,8715 -export _SettargTable_;220,9044 -export PATH;226,9331 -TARG=227,9344 -export TARG;228,9391 -unset TARG_BUILD_SCENARIO;229,9404 -TARG_COMPILER=230,9431 -export TARG_COMPILER;231,9456 -TARG_COMPILER_FAMILY=232,9478 -export TARG_COMPILER_FAMILY;233,9504 -TARG_EXTRA=234,9533 -export TARG_EXTRA;235,9549 -TARG_HOST=236,9568 -export TARG_HOST;237,9591 -TARG_MACH=238,9609 -export TARG_MACH;239,9629 -TARG_MACH_DESCRIPT=240,9647 -export TARG_MACH_DESCRIPT;241,9683 -TARG_MPI=242,9710 -export TARG_MPI;243,9732 -TARG_MPI_FAMILY=244,9749 -export TARG_MPI_FAMILY;245,9772 -TARG_OS=246,9796 -export TARG_OS;247,9815 -TARG_OS_FAMILY=248,9831 -export TARG_OS_FAMILY;249,9864 -TARG_SUMMARY=250,9887 -export TARG_SUMMARY;251,9936 -TARG_TITLE_BAR=252,9957 -export TARG_TITLE_BAR;253,9995 -TARG_TITLE_BAR_PAREN=254,10018 -export TARG_TITLE_BAR_PAREN;255,10066 -_SettargTable_=256,10095 -export _SettargTable_;257,10433 -export PATH;263,10724 -TARG=264,10737 -export TARG;265,10788 -unset TARG_BUILD_SCENARIO;266,10801 -TARG_COMPILER=267,10828 -export TARG_COMPILER;268,10853 -TARG_COMPILER_FAMILY=269,10875 -export TARG_COMPILER_FAMILY;270,10901 -TARG_EXTRA=271,10930 -export TARG_EXTRA;272,10950 -TARG_HOST=273,10969 -export TARG_HOST;274,10992 -TARG_MACH=275,11010 -export TARG_MACH;276,11030 -TARG_MACH_DESCRIPT=277,11048 -export TARG_MACH_DESCRIPT;278,11084 -TARG_MPI=279,11111 -export TARG_MPI;280,11133 -TARG_MPI_FAMILY=281,11150 -export TARG_MPI_FAMILY;282,11173 -TARG_OS=283,11197 -export TARG_OS;284,11216 -TARG_OS_FAMILY=285,11232 -export TARG_OS_FAMILY;286,11265 -TARG_SUMMARY=287,11288 -export TARG_SUMMARY;288,11341 -TARG_TITLE_BAR=289,11362 -export TARG_TITLE_BAR;290,11404 -TARG_TITLE_BAR_PAREN=291,11427 -export TARG_TITLE_BAR_PAREN;292,11479 -_SettargTable_=293,11508 -export _SettargTable_;294,11859 -export PATH;300,12150 -TARG=301,12163 -export TARG;302,12210 -unset TARG_BUILD_SCENARIO;303,12223 -TARG_COMPILER=304,12250 -export TARG_COMPILER;305,12275 -TARG_COMPILER_FAMILY=306,12297 -export TARG_COMPILER_FAMILY;307,12323 -TARG_EXTRA=308,12352 -export TARG_EXTRA;309,12368 -TARG_HOST=310,12387 -export TARG_HOST;311,12410 -TARG_MACH=312,12428 -export TARG_MACH;313,12448 -TARG_MACH_DESCRIPT=314,12466 -export TARG_MACH_DESCRIPT;315,12502 -TARG_MPI=316,12529 -export TARG_MPI;317,12551 -TARG_MPI_FAMILY=318,12568 -export TARG_MPI_FAMILY;319,12591 -TARG_OS=320,12615 -export TARG_OS;321,12634 -TARG_OS_FAMILY=322,12650 -export TARG_OS_FAMILY;323,12683 -TARG_SUMMARY=324,12706 -export TARG_SUMMARY;325,12755 -TARG_TITLE_BAR=326,12776 -export TARG_TITLE_BAR;327,12814 -TARG_TITLE_BAR_PAREN=328,12837 -export TARG_TITLE_BAR_PAREN;329,12885 -_SettargTable_=330,12914 -export _SettargTable_;331,13256 -export PATH;337,13543 -TARG=338,13556 -export TARG;339,13599 -unset TARG_BUILD_SCENARIO;340,13612 -TARG_COMPILER=341,13639 -export TARG_COMPILER;342,13664 -TARG_COMPILER_FAMILY=343,13686 -export TARG_COMPILER_FAMILY;344,13712 -unset TARG_EXTRA;345,13741 -TARG_HOST=346,13759 -export TARG_HOST;347,13782 -TARG_MACH=348,13800 -export TARG_MACH;349,13820 -TARG_MACH_DESCRIPT=350,13838 -export TARG_MACH_DESCRIPT;351,13874 -TARG_MPI=352,13901 -export TARG_MPI;353,13923 -TARG_MPI_FAMILY=354,13940 -export TARG_MPI_FAMILY;355,13963 -TARG_OS=356,13987 -export TARG_OS;357,14006 -TARG_OS_FAMILY=358,14022 -export TARG_OS_FAMILY;359,14055 -TARG_SUMMARY=360,14078 -export TARG_SUMMARY;361,14123 -TARG_TITLE_BAR=362,14144 -export TARG_TITLE_BAR;363,14177 -TARG_TITLE_BAR_PAREN=364,14200 -export TARG_TITLE_BAR_PAREN;365,14243 -_SettargTable_=366,14272 -export _SettargTable_;367,14601 -export PATH;373,14897 -TARG=374,14910 -export TARG;375,14961 -unset TARG_BUILD_SCENARIO;376,14974 -TARG_COMPILER=377,15001 -export TARG_COMPILER;378,15026 -TARG_COMPILER_FAMILY=379,15048 -export TARG_COMPILER_FAMILY;380,15074 -TARG_EXTRA=381,15103 -export TARG_EXTRA;382,15123 -TARG_HOST=383,15142 -export TARG_HOST;384,15165 -TARG_MACH=385,15183 -export TARG_MACH;386,15203 -TARG_MACH_DESCRIPT=387,15221 -export TARG_MACH_DESCRIPT;388,15257 -TARG_MPI=389,15284 -export TARG_MPI;390,15306 -TARG_MPI_FAMILY=391,15323 -export TARG_MPI_FAMILY;392,15346 -TARG_OS=393,15370 -export TARG_OS;394,15389 -TARG_OS_FAMILY=395,15405 -export TARG_OS_FAMILY;396,15438 -TARG_SUMMARY=397,15461 -export TARG_SUMMARY;398,15514 -TARG_TITLE_BAR=399,15535 -export TARG_TITLE_BAR;400,15577 -TARG_TITLE_BAR_PAREN=401,15600 -export TARG_TITLE_BAR_PAREN;402,15652 -_SettargTable_=403,15681 -export _SettargTable_;404,16032 -export PATH;410,16334 -TARG=411,16347 -export TARG;412,16402 -TARG_BUILD_SCENARIO=413,16415 -export TARG_BUILD_SCENARIO;414,16440 -TARG_COMPILER=415,16468 -export TARG_COMPILER;416,16493 -TARG_COMPILER_FAMILY=417,16515 -export TARG_COMPILER_FAMILY;418,16541 -TARG_EXTRA=419,16570 -export TARG_EXTRA;420,16590 -TARG_HOST=421,16609 -export TARG_HOST;422,16632 -TARG_MACH=423,16650 -export TARG_MACH;424,16670 -TARG_MACH_DESCRIPT=425,16688 -export TARG_MACH_DESCRIPT;426,16724 -TARG_MPI=427,16751 -export TARG_MPI;428,16773 -TARG_MPI_FAMILY=429,16790 -export TARG_MPI_FAMILY;430,16813 -TARG_OS=431,16837 -export TARG_OS;432,16856 -TARG_OS_FAMILY=433,16872 -export TARG_OS_FAMILY;434,16905 -TARG_SUMMARY=435,16928 -export TARG_SUMMARY;436,16985 -TARG_TITLE_BAR=437,17006 -export TARG_TITLE_BAR;438,17051 -TARG_TITLE_BAR_PAREN=439,17074 -export TARG_TITLE_BAR_PAREN;440,17129 -_SettargTable_=441,17158 -export _SettargTable_;442,17507 -export PATH;448,17799 -TARG=449,17812 -export TARG;450,17859 -TARG_BUILD_SCENARIO=451,17872 -export TARG_BUILD_SCENARIO;452,17897 -TARG_COMPILER=453,17925 -export TARG_COMPILER;454,17950 -TARG_COMPILER_FAMILY=455,17972 -export TARG_COMPILER_FAMILY;456,17998 -unset TARG_EXTRA;457,18027 -TARG_HOST=458,18045 -export TARG_HOST;459,18068 -TARG_MACH=460,18086 -export TARG_MACH;461,18106 -TARG_MACH_DESCRIPT=462,18124 -export TARG_MACH_DESCRIPT;463,18160 -TARG_MPI=464,18187 -export TARG_MPI;465,18209 -TARG_MPI_FAMILY=466,18226 -export TARG_MPI_FAMILY;467,18249 -TARG_OS=468,18273 -export TARG_OS;469,18292 -TARG_OS_FAMILY=470,18308 -export TARG_OS_FAMILY;471,18341 -TARG_SUMMARY=472,18364 -export TARG_SUMMARY;473,18413 -TARG_TITLE_BAR=474,18434 -export TARG_TITLE_BAR;475,18470 -TARG_TITLE_BAR_PAREN=476,18493 -export TARG_TITLE_BAR_PAREN;477,18539 -_SettargTable_=478,18568 -export _SettargTable_;479,18895 -unset LD_LIBRARY_PATH;490,19200 -unset LMOD_FAMILY_MPI;491,19223 -unset LMOD_FAMILY_MPI_VERSION;492,19246 -LOADEDMODULES=493,19277 -export LOADEDMODULES;494,19314 -unset __LMOD_REF_COUNT_MANPATH;495,19336 -unset MANPATH;496,19368 -__LMOD_REF_COUNT_MODULEPATH=497,19383 -export __LMOD_REF_COUNT_MODULEPATH;498,19510 -MODULEPATH=499,19546 -export MODULEPATH;500,19648 -unset MPICH_HOME;501,19667 -unset MPIHOME;502,19685 -__LMOD_REF_COUNT_PATH=503,19700 -export __LMOD_REF_COUNT_PATH;504,19826 -PATH=505,19856 -export PATH;506,19954 -_LMFILES_=507,19967 -export _LMFILES_;508,20056 -_ModuleTable_=509,20074 -export _ModuleTable_;510,20683 -export PATH;516,20920 -TARG=517,20933 -export TARG;518,20968 -TARG_BUILD_SCENARIO=519,20981 -export TARG_BUILD_SCENARIO;520,21006 -TARG_COMPILER=521,21034 -export TARG_COMPILER;522,21059 -TARG_COMPILER_FAMILY=523,21081 -export TARG_COMPILER_FAMILY;524,21107 -unset TARG_EXTRA;525,21136 -TARG_HOST=526,21154 -export TARG_HOST;527,21177 -TARG_MACH=528,21195 -export TARG_MACH;529,21215 -TARG_MACH_DESCRIPT=530,21233 -export TARG_MACH_DESCRIPT;531,21269 -unset TARG_MPI;532,21296 -unset TARG_MPI_FAMILY;533,21312 -TARG_OS=534,21335 -export TARG_OS;535,21354 -TARG_OS_FAMILY=536,21370 -export TARG_OS_FAMILY;537,21403 -TARG_SUMMARY=538,21426 -export TARG_SUMMARY;539,21463 -TARG_TITLE_BAR=540,21484 -export TARG_TITLE_BAR;541,21511 -TARG_TITLE_BAR_PAREN=542,21534 -export TARG_TITLE_BAR_PAREN;543,21571 -_SettargTable_=544,21600 -export _SettargTable_;545,21898 -unset LMOD_FAMILY_COMPILER_VERSION;551,22082 -LOADEDMODULES=552,22118 -export LOADEDMODULES;553,22145 -__LMOD_REF_COUNT_MODULEPATH=554,22167 -export __LMOD_REF_COUNT_MODULEPATH;555,22249 -MODULEPATH=556,22285 -export MODULEPATH;557,22345 -_LMFILES_=558,22364 -export _LMFILES_;559,22409 -_ModuleTable_=560,22427 -export _ModuleTable_;561,22792 -export LMOD_FAMILY_COMPILER;567,22987 -LMOD_FAMILY_COMPILER_VERSION=568,23016 -export LMOD_FAMILY_COMPILER_VERSION;569,23050 -LOADEDMODULES=570,23087 -export LOADEDMODULES;571,23130 -__LMOD_REF_COUNT_MODULEPATH=572,23152 -export __LMOD_REF_COUNT_MODULEPATH;573,23287 -MODULEPATH=574,23323 -export MODULEPATH;575,23433 -_LMFILES_=576,23452 -export _LMFILES_;577,23547 -_ModuleTable_=578,23565 -export _ModuleTable_;579,24212 -export MODULEPATH;585,24479 -_ModuleTable_=586,24498 -export _ModuleTable_;587,25145 -LOADEDMODULES=593,25328 -export LOADEDMODULES;594,25359 -MODULEPATH=595,25381 -export MODULEPATH;596,25491 -__LMOD_REF_COUNT_PATH=597,25510 -export __LMOD_REF_COUNT_PATH;598,25602 -PATH=599,25632 -export PATH;600,25699 -unset PROMPT_COMMAND;601,25712 -_LMFILES_=602,25734 -export _LMFILES_;603,25795 -_ModuleTable_=604,25813 -export _ModuleTable_;605,26295 -unset __LMOD_STACK_PROMPT_COMMAND;606,26317 -unalias cdt 2> /dev/null || true;607,26352 -unset -f dbg 2> /dev/null || true;608,26386 -unset -f empty 2> /dev/null || true;609,26421 -unset -f gettargdir 2> /dev/null || true;610,26458 -unset -f mdbg 2> /dev/null || true;611,26500 -unset -f opt 2> /dev/null || true;612,26536 -unset -f precmd 2> /dev/null || true;613,26571 -unset -f settarg 2> /dev/null || true;614,26609 -unset -f targ 2> /dev/null || true;615,26648 -eval `lua ProjectDIR/settarg/settarg_cmd.in.lua -s bash --destroy`destroy616,26684 +export _ModuleTable_;184,7889 +export PATH;190,8167 +TARG=191,8180 +export TARG;192,8223 +unset TARG_BUILD_SCENARIO;193,8236 +TARG_COMPILER=194,8263 +export TARG_COMPILER;195,8288 +TARG_COMPILER_FAMILY=196,8310 +export TARG_COMPILER_FAMILY;197,8336 +unset TARG_EXTRA;198,8365 +TARG_HOST=199,8383 +export TARG_HOST;200,8406 +TARG_MACH=201,8424 +export TARG_MACH;202,8444 +TARG_MACH_DESCRIPT=203,8462 +export TARG_MACH_DESCRIPT;204,8498 +TARG_MPI=205,8525 +export TARG_MPI;206,8547 +TARG_MPI_FAMILY=207,8564 +export TARG_MPI_FAMILY;208,8587 +TARG_OS=209,8611 +export TARG_OS;210,8630 +TARG_OS_FAMILY=211,8646 +export TARG_OS_FAMILY;212,8679 +TARG_SUMMARY=213,8702 +export TARG_SUMMARY;214,8747 +TARG_TITLE_BAR=215,8768 +export TARG_TITLE_BAR;216,8801 +TARG_TITLE_BAR_PAREN=217,8824 +export TARG_TITLE_BAR_PAREN;218,8867 +_SettargTable_=219,8896 +export _SettargTable_;220,9225 +export PATH;226,9512 +TARG=227,9525 +export TARG;228,9572 +unset TARG_BUILD_SCENARIO;229,9585 +TARG_COMPILER=230,9612 +export TARG_COMPILER;231,9637 +TARG_COMPILER_FAMILY=232,9659 +export TARG_COMPILER_FAMILY;233,9685 +TARG_EXTRA=234,9714 +export TARG_EXTRA;235,9730 +TARG_HOST=236,9749 +export TARG_HOST;237,9772 +TARG_MACH=238,9790 +export TARG_MACH;239,9810 +TARG_MACH_DESCRIPT=240,9828 +export TARG_MACH_DESCRIPT;241,9864 +TARG_MPI=242,9891 +export TARG_MPI;243,9913 +TARG_MPI_FAMILY=244,9930 +export TARG_MPI_FAMILY;245,9953 +TARG_OS=246,9977 +export TARG_OS;247,9996 +TARG_OS_FAMILY=248,10012 +export TARG_OS_FAMILY;249,10045 +TARG_SUMMARY=250,10068 +export TARG_SUMMARY;251,10117 +TARG_TITLE_BAR=252,10138 +export TARG_TITLE_BAR;253,10176 +TARG_TITLE_BAR_PAREN=254,10199 +export TARG_TITLE_BAR_PAREN;255,10247 +_SettargTable_=256,10276 +export _SettargTable_;257,10614 +export PATH;263,10905 +TARG=264,10918 +export TARG;265,10969 +unset TARG_BUILD_SCENARIO;266,10982 +TARG_COMPILER=267,11009 +export TARG_COMPILER;268,11034 +TARG_COMPILER_FAMILY=269,11056 +export TARG_COMPILER_FAMILY;270,11082 +TARG_EXTRA=271,11111 +export TARG_EXTRA;272,11131 +TARG_HOST=273,11150 +export TARG_HOST;274,11173 +TARG_MACH=275,11191 +export TARG_MACH;276,11211 +TARG_MACH_DESCRIPT=277,11229 +export TARG_MACH_DESCRIPT;278,11265 +TARG_MPI=279,11292 +export TARG_MPI;280,11314 +TARG_MPI_FAMILY=281,11331 +export TARG_MPI_FAMILY;282,11354 +TARG_OS=283,11378 +export TARG_OS;284,11397 +TARG_OS_FAMILY=285,11413 +export TARG_OS_FAMILY;286,11446 +TARG_SUMMARY=287,11469 +export TARG_SUMMARY;288,11522 +TARG_TITLE_BAR=289,11543 +export TARG_TITLE_BAR;290,11585 +TARG_TITLE_BAR_PAREN=291,11608 +export TARG_TITLE_BAR_PAREN;292,11660 +_SettargTable_=293,11689 +export _SettargTable_;294,12040 +export PATH;300,12331 +TARG=301,12344 +export TARG;302,12391 +unset TARG_BUILD_SCENARIO;303,12404 +TARG_COMPILER=304,12431 +export TARG_COMPILER;305,12456 +TARG_COMPILER_FAMILY=306,12478 +export TARG_COMPILER_FAMILY;307,12504 +TARG_EXTRA=308,12533 +export TARG_EXTRA;309,12549 +TARG_HOST=310,12568 +export TARG_HOST;311,12591 +TARG_MACH=312,12609 +export TARG_MACH;313,12629 +TARG_MACH_DESCRIPT=314,12647 +export TARG_MACH_DESCRIPT;315,12683 +TARG_MPI=316,12710 +export TARG_MPI;317,12732 +TARG_MPI_FAMILY=318,12749 +export TARG_MPI_FAMILY;319,12772 +TARG_OS=320,12796 +export TARG_OS;321,12815 +TARG_OS_FAMILY=322,12831 +export TARG_OS_FAMILY;323,12864 +TARG_SUMMARY=324,12887 +export TARG_SUMMARY;325,12936 +TARG_TITLE_BAR=326,12957 +export TARG_TITLE_BAR;327,12995 +TARG_TITLE_BAR_PAREN=328,13018 +export TARG_TITLE_BAR_PAREN;329,13066 +_SettargTable_=330,13095 +export _SettargTable_;331,13437 +export PATH;337,13724 +TARG=338,13737 +export TARG;339,13780 +unset TARG_BUILD_SCENARIO;340,13793 +TARG_COMPILER=341,13820 +export TARG_COMPILER;342,13845 +TARG_COMPILER_FAMILY=343,13867 +export TARG_COMPILER_FAMILY;344,13893 +unset TARG_EXTRA;345,13922 +TARG_HOST=346,13940 +export TARG_HOST;347,13963 +TARG_MACH=348,13981 +export TARG_MACH;349,14001 +TARG_MACH_DESCRIPT=350,14019 +export TARG_MACH_DESCRIPT;351,14055 +TARG_MPI=352,14082 +export TARG_MPI;353,14104 +TARG_MPI_FAMILY=354,14121 +export TARG_MPI_FAMILY;355,14144 +TARG_OS=356,14168 +export TARG_OS;357,14187 +TARG_OS_FAMILY=358,14203 +export TARG_OS_FAMILY;359,14236 +TARG_SUMMARY=360,14259 +export TARG_SUMMARY;361,14304 +TARG_TITLE_BAR=362,14325 +export TARG_TITLE_BAR;363,14358 +TARG_TITLE_BAR_PAREN=364,14381 +export TARG_TITLE_BAR_PAREN;365,14424 +_SettargTable_=366,14453 +export _SettargTable_;367,14782 +export PATH;373,15078 +TARG=374,15091 +export TARG;375,15142 +unset TARG_BUILD_SCENARIO;376,15155 +TARG_COMPILER=377,15182 +export TARG_COMPILER;378,15207 +TARG_COMPILER_FAMILY=379,15229 +export TARG_COMPILER_FAMILY;380,15255 +TARG_EXTRA=381,15284 +export TARG_EXTRA;382,15304 +TARG_HOST=383,15323 +export TARG_HOST;384,15346 +TARG_MACH=385,15364 +export TARG_MACH;386,15384 +TARG_MACH_DESCRIPT=387,15402 +export TARG_MACH_DESCRIPT;388,15438 +TARG_MPI=389,15465 +export TARG_MPI;390,15487 +TARG_MPI_FAMILY=391,15504 +export TARG_MPI_FAMILY;392,15527 +TARG_OS=393,15551 +export TARG_OS;394,15570 +TARG_OS_FAMILY=395,15586 +export TARG_OS_FAMILY;396,15619 +TARG_SUMMARY=397,15642 +export TARG_SUMMARY;398,15695 +TARG_TITLE_BAR=399,15716 +export TARG_TITLE_BAR;400,15758 +TARG_TITLE_BAR_PAREN=401,15781 +export TARG_TITLE_BAR_PAREN;402,15833 +_SettargTable_=403,15862 +export _SettargTable_;404,16213 +export PATH;410,16515 +TARG=411,16528 +export TARG;412,16583 +TARG_BUILD_SCENARIO=413,16596 +export TARG_BUILD_SCENARIO;414,16621 +TARG_COMPILER=415,16649 +export TARG_COMPILER;416,16674 +TARG_COMPILER_FAMILY=417,16696 +export TARG_COMPILER_FAMILY;418,16722 +TARG_EXTRA=419,16751 +export TARG_EXTRA;420,16771 +TARG_HOST=421,16790 +export TARG_HOST;422,16813 +TARG_MACH=423,16831 +export TARG_MACH;424,16851 +TARG_MACH_DESCRIPT=425,16869 +export TARG_MACH_DESCRIPT;426,16905 +TARG_MPI=427,16932 +export TARG_MPI;428,16954 +TARG_MPI_FAMILY=429,16971 +export TARG_MPI_FAMILY;430,16994 +TARG_OS=431,17018 +export TARG_OS;432,17037 +TARG_OS_FAMILY=433,17053 +export TARG_OS_FAMILY;434,17086 +TARG_SUMMARY=435,17109 +export TARG_SUMMARY;436,17166 +TARG_TITLE_BAR=437,17187 +export TARG_TITLE_BAR;438,17232 +TARG_TITLE_BAR_PAREN=439,17255 +export TARG_TITLE_BAR_PAREN;440,17310 +_SettargTable_=441,17339 +export _SettargTable_;442,17688 +export PATH;448,17980 +TARG=449,17993 +export TARG;450,18040 +TARG_BUILD_SCENARIO=451,18053 +export TARG_BUILD_SCENARIO;452,18078 +TARG_COMPILER=453,18106 +export TARG_COMPILER;454,18131 +TARG_COMPILER_FAMILY=455,18153 +export TARG_COMPILER_FAMILY;456,18179 +unset TARG_EXTRA;457,18208 +TARG_HOST=458,18226 +export TARG_HOST;459,18249 +TARG_MACH=460,18267 +export TARG_MACH;461,18287 +TARG_MACH_DESCRIPT=462,18305 +export TARG_MACH_DESCRIPT;463,18341 +TARG_MPI=464,18368 +export TARG_MPI;465,18390 +TARG_MPI_FAMILY=466,18407 +export TARG_MPI_FAMILY;467,18430 +TARG_OS=468,18454 +export TARG_OS;469,18473 +TARG_OS_FAMILY=470,18489 +export TARG_OS_FAMILY;471,18522 +TARG_SUMMARY=472,18545 +export TARG_SUMMARY;473,18594 +TARG_TITLE_BAR=474,18615 +export TARG_TITLE_BAR;475,18651 +TARG_TITLE_BAR_PAREN=476,18674 +export TARG_TITLE_BAR_PAREN;477,18720 +_SettargTable_=478,18749 +export _SettargTable_;479,19076 +unset LD_LIBRARY_PATH;490,19381 +unset LMOD_FAMILY_MPI;491,19404 +unset LMOD_FAMILY_MPI_VERSION;492,19427 +LOADEDMODULES=493,19458 +export LOADEDMODULES;494,19495 +unset __LMOD_REF_COUNT_MANPATH;495,19517 +unset MANPATH;496,19549 +__LMOD_REF_COUNT_MODULEPATH=497,19564 +export __LMOD_REF_COUNT_MODULEPATH;498,19691 +MODULEPATH=499,19727 +export MODULEPATH;500,19829 +unset MPICH_HOME;501,19848 +unset MPIHOME;502,19866 +__LMOD_REF_COUNT_PATH=503,19881 +export __LMOD_REF_COUNT_PATH;504,20007 +PATH=505,20037 +export PATH;506,20135 +_LMFILES_=507,20148 +export _LMFILES_;508,20237 +_ModuleTable_=509,20255 +export _ModuleTable_;510,20952 +export PATH;516,21189 +TARG=517,21202 +export TARG;518,21237 +TARG_BUILD_SCENARIO=519,21250 +export TARG_BUILD_SCENARIO;520,21275 +TARG_COMPILER=521,21303 +export TARG_COMPILER;522,21328 +TARG_COMPILER_FAMILY=523,21350 +export TARG_COMPILER_FAMILY;524,21376 +unset TARG_EXTRA;525,21405 +TARG_HOST=526,21423 +export TARG_HOST;527,21446 +TARG_MACH=528,21464 +export TARG_MACH;529,21484 +TARG_MACH_DESCRIPT=530,21502 +export TARG_MACH_DESCRIPT;531,21538 +unset TARG_MPI;532,21565 +unset TARG_MPI_FAMILY;533,21581 +TARG_OS=534,21604 +export TARG_OS;535,21623 +TARG_OS_FAMILY=536,21639 +export TARG_OS_FAMILY;537,21672 +TARG_SUMMARY=538,21695 +export TARG_SUMMARY;539,21732 +TARG_TITLE_BAR=540,21753 +export TARG_TITLE_BAR;541,21780 +TARG_TITLE_BAR_PAREN=542,21803 +export TARG_TITLE_BAR_PAREN;543,21840 +_SettargTable_=544,21869 +export _SettargTable_;545,22167 +unset LMOD_FAMILY_COMPILER_VERSION;551,22351 +LOADEDMODULES=552,22387 +export LOADEDMODULES;553,22414 +__LMOD_REF_COUNT_MODULEPATH=554,22436 +export __LMOD_REF_COUNT_MODULEPATH;555,22518 +MODULEPATH=556,22554 +export MODULEPATH;557,22614 +_LMFILES_=558,22633 +export _LMFILES_;559,22678 +_ModuleTable_=560,22696 +export _ModuleTable_;561,23061 +export LMOD_FAMILY_COMPILER;567,23256 +LMOD_FAMILY_COMPILER_VERSION=568,23285 +export LMOD_FAMILY_COMPILER_VERSION;569,23319 +LOADEDMODULES=570,23356 +export LOADEDMODULES;571,23399 +__LMOD_REF_COUNT_MODULEPATH=572,23421 +export __LMOD_REF_COUNT_MODULEPATH;573,23556 +MODULEPATH=574,23592 +export MODULEPATH;575,23702 +_LMFILES_=576,23721 +export _LMFILES_;577,23816 +_ModuleTable_=578,23834 +export _ModuleTable_;579,24577 +export MODULEPATH;585,24844 +_ModuleTable_=586,24863 +export _ModuleTable_;587,25606 +LOADEDMODULES=593,25789 +export LOADEDMODULES;594,25820 +MODULEPATH=595,25842 +export MODULEPATH;596,25952 +__LMOD_REF_COUNT_PATH=597,25971 +export __LMOD_REF_COUNT_PATH;598,26063 +PATH=599,26093 +export PATH;600,26160 +unset PROMPT_COMMAND;601,26173 +_LMFILES_=602,26195 +export _LMFILES_;603,26256 +_ModuleTable_=604,26274 +export _ModuleTable_;605,26852 +unset __LMOD_STACK_PROMPT_COMMAND;606,26874 +unalias cdt 2> /dev/null || true;607,26909 +unset -f dbg 2> /dev/null || true;608,26943 +unset -f empty 2> /dev/null || true;609,26978 +unset -f gettargdir 2> /dev/null || true;610,27015 +unset -f mdbg 2> /dev/null || true;611,27057 +unset -f opt 2> /dev/null || true;612,27093 +unset -f precmd 2> /dev/null || true;613,27128 +unset -f settarg 2> /dev/null || true;614,27166 +unset -f targ 2> /dev/null || true;615,27205 +eval `lua ProjectDIR/settarg/settarg_cmd.in.lua -s bash --destroy`destroy616,27241 rt/settarg/err.txt,29 -set_shell_function(108,3963 +set_shell_function(108,3962 rt/saverestore/TACC/TACC,35 set modulepath_root $env(34,1137 @@ -3894,7 +3892,7 @@ setenv GLOBUS_TCP_PORT_RANGE 38,2104 rt/saverestore/.lmod.d/stdenv,21 _ModuleTable_ 4,112 -rt/saverestore/out.txt,17972 +rt/saverestore/out.txt,17974 export __LMOD_REF_COUNT_MODULEPATH;10,323 MODULEPATH=11,359 export MODULEPATH;12,402 @@ -3958,554 +3956,554 @@ export SHLIB_PATH;74,4832 _LMFILES_=75,4851 export _LMFILES_;76,5164 _ModuleTable_=77,5182 -export _ModuleTable_;78,6690 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;84,7126 -LD_LIBRARY_PATH=85,7167 -export LD_LIBRARY_PATH;86,7414 -LOADEDMODULES=87,7438 -export LOADEDMODULES;88,7536 -__LMOD_REF_COUNT_MANPATH=89,7558 -export __LMOD_REF_COUNT_MANPATH;90,7929 -MANPATH=91,7962 -export MANPATH;92,8281 -__LMOD_REF_COUNT_MODULEPATH=93,8297 -export __LMOD_REF_COUNT_MODULEPATH;94,8472 -MODULEPATH=95,8508 -export MODULEPATH;96,8658 -__LMOD_REF_COUNT_PATH=97,8677 -export __LMOD_REF_COUNT_PATH;98,9074 -PATH=99,9104 -export PATH;100,9449 -PGI=101,9462 -export PGI;102,9491 -_LMFILES_=103,9503 -export _LMFILES_;104,9818 -_ModuleTable_=105,9836 -export _ModuleTable_;106,11375 -export MODULEPATH;112,11673 -_ModuleTable_=113,11692 -export _ModuleTable_;114,13231 -export MODULEPATH;120,13537 -_ModuleTable_=121,13556 -export _ModuleTable_;122,15095 -export APPS;128,15266 -GLOBUS_HOSTNAME=129,15279 -export GLOBUS_HOSTNAME;130,15319 -GLOBUS_LOCATION=131,15343 -export GLOBUS_LOCATION;132,15397 -GLOBUS_PATH=133,15421 -export GLOBUS_PATH;134,15471 -GLOBUS_TCP_PORT_RANGE=135,15491 -export GLOBUS_TCP_PORT_RANGE;136,15526 -GPT_LOCATION=137,15556 -export GPT_LOCATION;138,15607 -INFOPATH=139,15628 -export INFOPATH;140,15680 -LD_LIBRARY_PATH=141,15697 -export LD_LIBRARY_PATH;142,15944 -LIBPATH=143,15968 -export LIBPATH;144,16071 -MANPATH=145,16087 -export MANPATH;146,16406 -MODULEPATH=147,16422 -export MODULEPATH;148,16572 -MPICH_HOME=149,16591 -export MPICH_HOME;150,16641 -MYPROXY_SERVER=151,16660 -export MYPROXY_SERVER;152,16697 -OMP_NUM_THREADS=153,16720 -export OMP_NUM_THREADS;154,16739 -PATH=155,16763 -export PATH;156,17108 -PGI=157,17121 -export PGI;158,17150 -PURGE=159,17162 -export PURGE;160,17173 -RSHCOMMAND=161,17187 -export RSHCOMMAND;162,17244 -SASL_PATH=163,17263 -export SASL_PATH;164,17316 -SHLIB_PATH=165,17334 -export SHLIB_PATH;166,17440 -_ModuleTable_=167,17459 -export _ModuleTable_;168,18998 -__LMOD_DEFAULT_MODULES_LOADED__=169,19020 -export __LMOD_DEFAULT_MODULES_LOADED__;170,19055 -export MODULEPATH;176,19371 -_ModuleTable_=177,19390 -export _ModuleTable_;178,20929 -export __LMOD_REF_COUNT_MODULEPATH;184,21318 -MODULEPATH=185,21354 -export MODULEPATH;186,21536 -_ModuleTable_=187,21555 -export _ModuleTable_;188,23128 -export FOO;194,23292 -LOADEDMODULES=195,23304 -export LOADEDMODULES;196,23406 -MODULEPATH=197,23428 -export MODULEPATH;198,23610 -RTM=199,23629 -export RTM;200,23643 -_LMFILES_=201,23655 -export _LMFILES_;202,24010 -_ModuleTable_=203,24028 -export _ModuleTable_;204,25745 -export MODULEPATH;210,26076 -_ModuleTable_=211,26095 -export _ModuleTable_;212,27812 -export MODULEPATH;218,28143 -_ModuleTable_=219,28162 -export _ModuleTable_;220,29879 -export MODULEPATH;226,30214 -_ModuleTable_=227,30233 -export _ModuleTable_;228,31950 -unset FOO;234,32112 -unset GLOBUS_HOSTNAME;235,32123 -unset GLOBUS_LOCATION;236,32146 -unset GLOBUS_PATH;237,32169 -unset GLOBUS_TCP_PORT_RANGE;238,32188 -unset GPT_LOCATION;239,32217 -unset __LMOD_REF_COUNT_INFOPATH;240,32237 -unset INFOPATH;241,32270 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;242,32286 -unset LD_LIBRARY_PATH;243,32326 -unset __LMOD_REF_COUNT_LIBPATH;244,32349 -unset LIBPATH;245,32381 -unset LOADEDMODULES;246,32396 -unset __LMOD_REF_COUNT_MANPATH;247,32417 -unset MANPATH;248,32449 -__LMOD_REF_COUNT_MODULEPATH=249,32464 -export __LMOD_REF_COUNT_MODULEPATH;250,32561 -MODULEPATH=251,32597 -export MODULEPATH;252,32672 -unset MPICH_HOME;253,32691 -unset MYPROXY_SERVER;254,32709 -__LMOD_REF_COUNT_PATH=255,32731 -export __LMOD_REF_COUNT_PATH;256,32791 -PATH=257,32821 -export PATH;258,32859 -unset PGI;259,32872 -unset PURGE;260,32883 -unset RSHCOMMAND;261,32896 -unset RTM;262,32914 -unset SASL_PATH;263,32925 -unset __LMOD_REF_COUNT_SHLIB_PATH;264,32942 -unset SHLIB_PATH;265,32977 -unset _LMFILES_;266,32995 -_ModuleTable_=267,33012 -export _ModuleTable_;268,33210 -export APPS;274,33382 -FOO=275,33395 -export FOO;276,33408 -GLOBUS_HOSTNAME=277,33420 -export GLOBUS_HOSTNAME;278,33460 -GLOBUS_LOCATION=279,33484 -export GLOBUS_LOCATION;280,33538 -GLOBUS_PATH=281,33562 -export GLOBUS_PATH;282,33612 -GLOBUS_TCP_PORT_RANGE=283,33632 -export GLOBUS_TCP_PORT_RANGE;284,33667 -GPT_LOCATION=285,33697 -export GPT_LOCATION;286,33748 -__LMOD_REF_COUNT_INFOPATH=287,33769 -export __LMOD_REF_COUNT_INFOPATH;288,33840 -INFOPATH=289,33874 -export INFOPATH;290,33926 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=291,33943 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;292,34221 -LD_LIBRARY_PATH=293,34262 -export LD_LIBRARY_PATH;294,34509 -__LMOD_REF_COUNT_LIBPATH=295,34533 -export __LMOD_REF_COUNT_LIBPATH;296,34658 -LIBPATH=297,34691 -export LIBPATH;298,34794 -LOADEDMODULES=299,34810 -export LOADEDMODULES;300,34912 -__LMOD_REF_COUNT_MANPATH=301,34934 -export __LMOD_REF_COUNT_MANPATH;302,35305 -MANPATH=303,35338 -export MANPATH;304,35657 -__LMOD_REF_COUNT_MODULEPATH=305,35673 -export __LMOD_REF_COUNT_MODULEPATH;306,35883 -MODULEPATH=307,35919 -export MODULEPATH;308,36101 -MPICH_HOME=309,36120 -export MPICH_HOME;310,36170 -MYPROXY_SERVER=311,36189 -export MYPROXY_SERVER;312,36226 -__LMOD_REF_COUNT_PATH=313,36249 -export __LMOD_REF_COUNT_PATH;314,36646 -PATH=315,36676 -export PATH;316,37021 -PGI=317,37034 -export PGI;318,37063 -PURGE=319,37075 -export PURGE;320,37086 -RSHCOMMAND=321,37100 -export RSHCOMMAND;322,37157 -RTM=323,37176 -export RTM;324,37190 -SASL_PATH=325,37202 -export SASL_PATH;326,37255 -__LMOD_REF_COUNT_SHLIB_PATH=327,37273 -export __LMOD_REF_COUNT_SHLIB_PATH;328,37401 -SHLIB_PATH=329,37437 -export SHLIB_PATH;330,37543 -_LMFILES_=331,37562 -export _LMFILES_;332,37917 -_ModuleTable_=333,37935 -export _ModuleTable_;334,39652 -__LMOD_DEFAULT_MODULES_LOADED__=335,39674 -export __LMOD_DEFAULT_MODULES_LOADED__;336,39709 -export MODULEPATH;342,40058 -_ModuleTable_=343,40077 -export _ModuleTable_;344,41794 -export MODULEPATH;350,42127 -_ModuleTable_=351,42146 -export _ModuleTable_;352,43863 -unset FOO;358,44025 -unset GLOBUS_HOSTNAME;359,44036 -unset GLOBUS_LOCATION;360,44059 -unset GLOBUS_PATH;361,44082 -unset GLOBUS_TCP_PORT_RANGE;362,44101 -unset GPT_LOCATION;363,44130 -unset __LMOD_REF_COUNT_INFOPATH;364,44150 -unset INFOPATH;365,44183 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;366,44199 -unset LD_LIBRARY_PATH;367,44239 -unset __LMOD_REF_COUNT_LIBPATH;368,44262 -unset LIBPATH;369,44294 -unset LOADEDMODULES;370,44309 -unset __LMOD_REF_COUNT_MANPATH;371,44330 -unset MANPATH;372,44362 -__LMOD_REF_COUNT_MODULEPATH=373,44377 -export __LMOD_REF_COUNT_MODULEPATH;374,44474 -MODULEPATH=375,44510 -export MODULEPATH;376,44585 -unset MPICH_HOME;377,44604 -unset MYPROXY_SERVER;378,44622 -__LMOD_REF_COUNT_PATH=379,44644 -export __LMOD_REF_COUNT_PATH;380,44704 -PATH=381,44734 -export PATH;382,44772 -unset PGI;383,44785 -unset PURGE;384,44796 -unset RSHCOMMAND;385,44809 -unset RTM;386,44827 -unset SASL_PATH;387,44838 -unset __LMOD_REF_COUNT_SHLIB_PATH;388,44855 -unset SHLIB_PATH;389,44890 -unset _LMFILES_;390,44908 -_ModuleTable_=391,44925 -export _ModuleTable_;392,45123 -export __LMOD_REF_COUNT_MODULEPATH;408,45605 -MODULEPATH=409,45641 -export MODULEPATH;410,45668 -_ModuleTable_=411,45687 -export _ModuleTable_;412,45819 -export __LMOD_REF_COUNT_MODULEPATH;418,46082 -MODULEPATH=419,46118 -export MODULEPATH;420,46178 -_ModuleTable_=421,46197 -export _ModuleTable_;422,46364 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;428,46567 -LD_LIBRARY_PATH=429,46608 -export LD_LIBRARY_PATH;430,46637 -LMOD_FAMILY_RESOURCEMGR=431,46661 -export LMOD_FAMILY_RESOURCEMGR;432,46688 -LMOD_FAMILY_RESOURCEMGR_VERSION=433,46720 -export LMOD_FAMILY_RESOURCEMGR_VERSION;434,46759 -LMOD_FAMILY_SCHEDULER=435,46799 -export LMOD_FAMILY_SCHEDULER;436,46824 -LMOD_FAMILY_SCHEDULER_VERSION=437,46854 -export LMOD_FAMILY_SCHEDULER_VERSION;438,46891 -LOADEDMODULES=439,46929 -export LOADEDMODULES;440,46966 -__LMOD_REF_COUNT_MANPATH=441,46988 -export __LMOD_REF_COUNT_MANPATH;442,47055 -MANPATH=443,47088 -export MANPATH;444,47133 -MODULEPATH=445,47149 -export MODULEPATH;446,47209 -__LMOD_REF_COUNT_PATH=447,47228 -export __LMOD_REF_COUNT_PATH;448,47350 -PATH=449,47380 -export PATH;450,47468 -_LMFILES_=451,47481 -export _LMFILES_;452,47625 -_ModuleTable_=453,47643 -export _ModuleTable_;454,48356 -export MODULEPATH;460,48565 -_ModuleTable_=461,48584 -export _ModuleTable_;462,49297 -export MODULEPATH;468,49506 -_ModuleTable_=469,49525 -export _ModuleTable_;470,50238 -export LD_LIBRARY_PATH;476,50419 -LMOD_FAMILY_RESOURCEMGR=477,50443 -export LMOD_FAMILY_RESOURCEMGR;478,50470 -LMOD_FAMILY_RESOURCEMGR_VERSION=479,50502 -export LMOD_FAMILY_RESOURCEMGR_VERSION;480,50541 -LMOD_FAMILY_SCHEDULER=481,50581 -export LMOD_FAMILY_SCHEDULER;482,50606 -LMOD_FAMILY_SCHEDULER_VERSION=483,50636 -export LMOD_FAMILY_SCHEDULER_VERSION;484,50673 -MANPATH=485,50711 -export MANPATH;486,50756 -MODULEPATH=487,50772 -export MODULEPATH;488,50832 -PATH=489,50851 -export PATH;490,50939 -_ModuleTable_=491,50952 -export _ModuleTable_;492,51665 -__LMOD_DEFAULT_MODULES_LOADED__=493,51687 -export __LMOD_DEFAULT_MODULES_LOADED__;494,51722 -export MODULEPATH;500,51949 -_ModuleTable_=501,51968 -export _ModuleTable_;502,52681 -unset LD_LIBRARY_PATH;508,52871 -unset LMOD_FAMILY_RESOURCEMGR;509,52894 -unset LMOD_FAMILY_RESOURCEMGR_VERSION;510,52925 -unset LMOD_FAMILY_SCHEDULER;511,52964 -unset LMOD_FAMILY_SCHEDULER_VERSION;512,52993 -unset LOADEDMODULES;513,53030 -unset __LMOD_REF_COUNT_MANPATH;514,53051 -unset MANPATH;515,53083 -MODULEPATH=516,53098 -export MODULEPATH;517,53158 -__LMOD_REF_COUNT_PATH=518,53177 -export __LMOD_REF_COUNT_PATH;519,53237 -PATH=520,53267 -export PATH;521,53305 -unset _LMFILES_;522,53318 -_ModuleTable_=523,53335 -export _ModuleTable_;524,53502 -export LOADEDMODULES;530,53682 -__LMOD_REF_COUNT_MANPATH=531,53704 -export __LMOD_REF_COUNT_MANPATH;532,53787 -MANPATH=533,53820 -export MANPATH;534,53881 -MODULEPATH=535,53897 -export MODULEPATH;536,53957 -__LMOD_REF_COUNT_PATH=537,53976 -export __LMOD_REF_COUNT_PATH;538,54094 -PATH=539,54124 -export PATH;540,54214 -_LMFILES_=541,54227 -export _LMFILES_;542,54280 -_ModuleTable_=543,54298 -export _ModuleTable_;544,54743 -export MODULEPATH;550,54952 -_ModuleTable_=551,54971 -export _ModuleTable_;552,55416 -export LOADEDMODULES;558,55595 -__LMOD_REF_COUNT_MANPATH=559,55617 -export __LMOD_REF_COUNT_MANPATH;560,55700 -MANPATH=561,55733 -export MANPATH;562,55794 -MODULEPATH=563,55810 -export MODULEPATH;564,55870 -__LMOD_REF_COUNT_PATH=565,55889 -export __LMOD_REF_COUNT_PATH;566,56007 -PATH=567,56037 -export PATH;568,56127 -_LMFILES_=569,56140 -export _LMFILES_;570,56193 -_ModuleTable_=571,56211 -export _ModuleTable_;572,56656 -__LMOD_DEFAULT_MODULES_LOADED__=573,56678 -export __LMOD_DEFAULT_MODULES_LOADED__;574,56713 -export MODULEPATH;580,56940 -_ModuleTable_=581,56959 -export _ModuleTable_;582,57404 -unset __LMOD_REF_COUNT_MANPATH;588,57575 -unset MANPATH;589,57607 -MODULEPATH=590,57622 -export MODULEPATH;591,57682 -__LMOD_REF_COUNT_PATH=592,57701 -export __LMOD_REF_COUNT_PATH;593,57761 -PATH=594,57791 -export PATH;595,57829 -unset _LMFILES_;596,57842 -_ModuleTable_=597,57859 -export _ModuleTable_;598,58026 -export LOADEDMODULES;604,58205 -__LMOD_REF_COUNT_MANPATH=605,58227 -export __LMOD_REF_COUNT_MANPATH;606,58310 -MANPATH=607,58343 -export MANPATH;608,58404 -MODULEPATH=609,58420 -export MODULEPATH;610,58480 -__LMOD_REF_COUNT_PATH=611,58499 -export __LMOD_REF_COUNT_PATH;612,58617 -PATH=613,58647 -export PATH;614,58737 -_LMFILES_=615,58750 -export _LMFILES_;616,58803 -_ModuleTable_=617,58821 -export _ModuleTable_;618,59274 -__LMOD_DEFAULT_MODULES_LOADED__=619,59296 -export __LMOD_DEFAULT_MODULES_LOADED__;620,59331 -export MODULEPATH;626,59558 -_ModuleTable_=627,59577 -export _ModuleTable_;628,60030 -unset __LMOD_REF_COUNT_MANPATH;634,60201 -unset MANPATH;635,60233 -MODULEPATH=636,60248 -export MODULEPATH;637,60308 -__LMOD_REF_COUNT_PATH=638,60327 -export __LMOD_REF_COUNT_PATH;639,60387 -PATH=640,60417 -export PATH;641,60455 -unset _LMFILES_;642,60468 -_ModuleTable_=643,60485 -export _ModuleTable_;644,60652 -export __LMOD_REF_COUNT_MODULEPATH;650,60943 -MODULEPATH=651,60979 -export MODULEPATH;652,61068 -_ModuleTable_=653,61087 -export _ModuleTable_;654,61285 -export LOADEDMODULES;660,61496 -MODULEPATH=661,61518 -export MODULEPATH;662,61607 -_LMFILES_=663,61626 -export _LMFILES_;664,61775 -_ModuleTable_=665,61793 -export _ModuleTable_;666,62597 -binutils=667,62619 -export binutils;668,62635 -numactl=669,62652 -export numactl;670,62669 -export MODULEPATH;676,62901 -_ModuleTable_=677,62920 -export _ModuleTable_;678,63724 -export MODULEPATH;684,63967 -_ModuleTable_=685,63986 -export _ModuleTable_;686,64790 -export MODULEPATH;692,65036 -_ModuleTable_=693,65055 -export _ModuleTable_;694,65859 -binutils=695,65881 -export binutils;696,65897 -numactl=697,65914 -export numactl;698,65931 -export MODULEPATH;704,66163 -_ModuleTable_=705,66182 -export _ModuleTable_;706,66986 -MODULEPATH=712,67157 -export MODULEPATH;713,67246 -unset _LMFILES_;714,67265 -_ModuleTable_=715,67282 -export _ModuleTable_;716,67480 -unset binutils;717,67502 -unset numactl;718,67518 -export LOADEDMODULES;724,67683 -__LMOD_REF_COUNT_MANPATH=725,67705 -export __LMOD_REF_COUNT_MANPATH;726,67759 -MANPATH=727,67792 -export MANPATH;728,67827 -__LMOD_REF_COUNT_MODULEPATH=729,67843 -export __LMOD_REF_COUNT_MODULEPATH;730,67905 -MODULEPATH=731,67941 -export MODULEPATH;732,67984 -__LMOD_REF_COUNT_PATH=733,68003 -export __LMOD_REF_COUNT_PATH;734,68092 -PATH=735,68122 -export PATH;736,68186 -_LMFILES_=737,68199 -export _LMFILES_;738,68247 -_ModuleTable_=739,68265 -export _ModuleTable_;740,68579 -export MODULEPATH;746,68776 -_ModuleTable_=747,68795 -export _ModuleTable_;748,69109 -unset __LMOD_REF_COUNT_MANPATH;754,69280 -unset MANPATH;755,69312 -MODULEPATH=756,69327 -export MODULEPATH;757,69370 -__LMOD_REF_COUNT_PATH=758,69389 -export __LMOD_REF_COUNT_PATH;759,69449 -PATH=760,69479 -export PATH;761,69517 -unset _LMFILES_;762,69530 -_ModuleTable_=763,69547 -export _ModuleTable_;764,69711 -export LOADEDMODULES;770,69889 -__LMOD_REF_COUNT_MANPATH=771,69911 -export __LMOD_REF_COUNT_MANPATH;772,69965 -MANPATH=773,69998 -export MANPATH;774,70033 -MODULEPATH=775,70049 -export MODULEPATH;776,70092 -__LMOD_REF_COUNT_PATH=777,70111 -export __LMOD_REF_COUNT_PATH;778,70200 -PATH=779,70230 -export PATH;780,70294 -_LMFILES_=781,70307 -export _LMFILES_;782,70355 -_ModuleTable_=783,70373 -export _ModuleTable_;784,70691 -unset __LMOD_REF_COUNT_MANPATH;790,70862 -unset MANPATH;791,70894 -MODULEPATH=792,70909 -export MODULEPATH;793,70952 -__LMOD_REF_COUNT_PATH=794,70971 -export __LMOD_REF_COUNT_PATH;795,71031 -PATH=796,71061 -export PATH;797,71099 -unset _LMFILES_;798,71112 -_ModuleTable_=799,71129 -export _ModuleTable_;800,71293 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;806,71551 -LD_LIBRARY_PATH=807,71592 -export LD_LIBRARY_PATH;808,71669 -LOADEDMODULES=809,71693 -export LOADEDMODULES;810,71732 -__LMOD_REF_COUNT_MODULEPATH=811,71754 -export __LMOD_REF_COUNT_MODULEPATH;812,71865 -MODULEPATH=813,71901 -export MODULEPATH;814,71990 -__LMOD_REF_COUNT_PATH=815,72009 -export __LMOD_REF_COUNT_PATH;816,72135 -PATH=817,72165 -export PATH;818,72263 -_LMFILES_=819,72276 -export _LMFILES_;820,72381 -_ModuleTable_=821,72399 -export _ModuleTable_;822,72995 -export MODULEPATH;828,73242 -_ModuleTable_=829,73261 -export _ModuleTable_;830,73857 -unset LD_LIBRARY_PATH;836,74047 -unset LOADEDMODULES;837,74070 -__LMOD_REF_COUNT_MODULEPATH=838,74091 -export __LMOD_REF_COUNT_MODULEPATH;839,74153 -MODULEPATH=840,74189 -export MODULEPATH;841,74232 -__LMOD_REF_COUNT_PATH=842,74251 -export __LMOD_REF_COUNT_PATH;843,74311 -PATH=844,74341 -export PATH;845,74379 -unset _LMFILES_;846,74392 -_ModuleTable_=847,74409 -export _ModuleTable_;848,74573 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;854,74833 -LD_LIBRARY_PATH=855,74874 -export LD_LIBRARY_PATH;856,74951 -LOADEDMODULES=857,74975 -export LOADEDMODULES;858,75014 -__LMOD_REF_COUNT_MODULEPATH=859,75036 -export __LMOD_REF_COUNT_MODULEPATH;860,75147 -MODULEPATH=861,75183 -export MODULEPATH;862,75272 -__LMOD_REF_COUNT_PATH=863,75291 -export __LMOD_REF_COUNT_PATH;864,75417 -PATH=865,75447 -export PATH;866,75545 -_LMFILES_=867,75558 -export _LMFILES_;868,75663 -_ModuleTable_=869,75681 -export _ModuleTable_;870,76291 +export _ModuleTable_;78,6887 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;84,7323 +LD_LIBRARY_PATH=85,7364 +export LD_LIBRARY_PATH;86,7611 +LOADEDMODULES=87,7635 +export LOADEDMODULES;88,7733 +__LMOD_REF_COUNT_MANPATH=89,7755 +export __LMOD_REF_COUNT_MANPATH;90,8126 +MANPATH=91,8159 +export MANPATH;92,8478 +__LMOD_REF_COUNT_MODULEPATH=93,8494 +export __LMOD_REF_COUNT_MODULEPATH;94,8669 +MODULEPATH=95,8705 +export MODULEPATH;96,8855 +__LMOD_REF_COUNT_PATH=97,8874 +export __LMOD_REF_COUNT_PATH;98,9271 +PATH=99,9301 +export PATH;100,9646 +PGI=101,9659 +export PGI;102,9688 +_LMFILES_=103,9700 +export _LMFILES_;104,10015 +_ModuleTable_=105,10033 +export _ModuleTable_;106,11771 +export MODULEPATH;112,12069 +_ModuleTable_=113,12088 +export _ModuleTable_;114,13826 +export MODULEPATH;120,14132 +_ModuleTable_=121,14151 +export _ModuleTable_;122,15889 +export APPS;128,16060 +GLOBUS_HOSTNAME=129,16073 +export GLOBUS_HOSTNAME;130,16113 +GLOBUS_LOCATION=131,16137 +export GLOBUS_LOCATION;132,16191 +GLOBUS_PATH=133,16215 +export GLOBUS_PATH;134,16265 +GLOBUS_TCP_PORT_RANGE=135,16285 +export GLOBUS_TCP_PORT_RANGE;136,16320 +GPT_LOCATION=137,16350 +export GPT_LOCATION;138,16401 +INFOPATH=139,16422 +export INFOPATH;140,16474 +LD_LIBRARY_PATH=141,16491 +export LD_LIBRARY_PATH;142,16738 +LIBPATH=143,16762 +export LIBPATH;144,16865 +MANPATH=145,16881 +export MANPATH;146,17200 +MODULEPATH=147,17216 +export MODULEPATH;148,17366 +MPICH_HOME=149,17385 +export MPICH_HOME;150,17435 +MYPROXY_SERVER=151,17454 +export MYPROXY_SERVER;152,17491 +OMP_NUM_THREADS=153,17514 +export OMP_NUM_THREADS;154,17533 +PATH=155,17557 +export PATH;156,17902 +PGI=157,17915 +export PGI;158,17944 +PURGE=159,17956 +export PURGE;160,17967 +RSHCOMMAND=161,17981 +export RSHCOMMAND;162,18038 +SASL_PATH=163,18057 +export SASL_PATH;164,18110 +SHLIB_PATH=165,18128 +export SHLIB_PATH;166,18234 +_ModuleTable_=167,18253 +export _ModuleTable_;168,19991 +__LMOD_DEFAULT_MODULES_LOADED__=169,20013 +export __LMOD_DEFAULT_MODULES_LOADED__;170,20048 +export MODULEPATH;176,20364 +_ModuleTable_=177,20383 +export _ModuleTable_;178,22121 +export __LMOD_REF_COUNT_MODULEPATH;184,22510 +MODULEPATH=185,22546 +export MODULEPATH;186,22728 +_ModuleTable_=187,22747 +export _ModuleTable_;188,24519 +export FOO;194,24683 +LOADEDMODULES=195,24695 +export LOADEDMODULES;196,24797 +MODULEPATH=197,24819 +export MODULEPATH;198,25001 +RTM=199,25020 +export RTM;200,25034 +_LMFILES_=201,25046 +export _LMFILES_;202,25401 +_ModuleTable_=203,25419 +export _ModuleTable_;204,27335 +export MODULEPATH;210,27666 +_ModuleTable_=211,27685 +export _ModuleTable_;212,29601 +export MODULEPATH;218,29932 +_ModuleTable_=219,29951 +export _ModuleTable_;220,31867 +export MODULEPATH;226,32202 +_ModuleTable_=227,32221 +export _ModuleTable_;228,34137 +unset FOO;234,34299 +unset GLOBUS_HOSTNAME;235,34310 +unset GLOBUS_LOCATION;236,34333 +unset GLOBUS_PATH;237,34356 +unset GLOBUS_TCP_PORT_RANGE;238,34375 +unset GPT_LOCATION;239,34404 +unset __LMOD_REF_COUNT_INFOPATH;240,34424 +unset INFOPATH;241,34457 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;242,34473 +unset LD_LIBRARY_PATH;243,34513 +unset __LMOD_REF_COUNT_LIBPATH;244,34536 +unset LIBPATH;245,34568 +unset LOADEDMODULES;246,34583 +unset __LMOD_REF_COUNT_MANPATH;247,34604 +unset MANPATH;248,34636 +__LMOD_REF_COUNT_MODULEPATH=249,34651 +export __LMOD_REF_COUNT_MODULEPATH;250,34748 +MODULEPATH=251,34784 +export MODULEPATH;252,34859 +unset MPICH_HOME;253,34878 +unset MYPROXY_SERVER;254,34896 +__LMOD_REF_COUNT_PATH=255,34918 +export __LMOD_REF_COUNT_PATH;256,34978 +PATH=257,35008 +export PATH;258,35046 +unset PGI;259,35059 +unset PURGE;260,35070 +unset RSHCOMMAND;261,35083 +unset RTM;262,35101 +unset SASL_PATH;263,35112 +unset __LMOD_REF_COUNT_SHLIB_PATH;264,35129 +unset SHLIB_PATH;265,35164 +unset _LMFILES_;266,35182 +_ModuleTable_=267,35199 +export _ModuleTable_;268,35397 +export APPS;274,35569 +FOO=275,35582 +export FOO;276,35595 +GLOBUS_HOSTNAME=277,35607 +export GLOBUS_HOSTNAME;278,35647 +GLOBUS_LOCATION=279,35671 +export GLOBUS_LOCATION;280,35725 +GLOBUS_PATH=281,35749 +export GLOBUS_PATH;282,35799 +GLOBUS_TCP_PORT_RANGE=283,35819 +export GLOBUS_TCP_PORT_RANGE;284,35854 +GPT_LOCATION=285,35884 +export GPT_LOCATION;286,35935 +__LMOD_REF_COUNT_INFOPATH=287,35956 +export __LMOD_REF_COUNT_INFOPATH;288,36027 +INFOPATH=289,36061 +export INFOPATH;290,36113 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=291,36130 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;292,36408 +LD_LIBRARY_PATH=293,36449 +export LD_LIBRARY_PATH;294,36696 +__LMOD_REF_COUNT_LIBPATH=295,36720 +export __LMOD_REF_COUNT_LIBPATH;296,36845 +LIBPATH=297,36878 +export LIBPATH;298,36981 +LOADEDMODULES=299,36997 +export LOADEDMODULES;300,37099 +__LMOD_REF_COUNT_MANPATH=301,37121 +export __LMOD_REF_COUNT_MANPATH;302,37492 +MANPATH=303,37525 +export MANPATH;304,37844 +__LMOD_REF_COUNT_MODULEPATH=305,37860 +export __LMOD_REF_COUNT_MODULEPATH;306,38070 +MODULEPATH=307,38106 +export MODULEPATH;308,38288 +MPICH_HOME=309,38307 +export MPICH_HOME;310,38357 +MYPROXY_SERVER=311,38376 +export MYPROXY_SERVER;312,38413 +__LMOD_REF_COUNT_PATH=313,38436 +export __LMOD_REF_COUNT_PATH;314,38833 +PATH=315,38863 +export PATH;316,39208 +PGI=317,39221 +export PGI;318,39250 +PURGE=319,39262 +export PURGE;320,39273 +RSHCOMMAND=321,39287 +export RSHCOMMAND;322,39344 +RTM=323,39363 +export RTM;324,39377 +SASL_PATH=325,39389 +export SASL_PATH;326,39442 +__LMOD_REF_COUNT_SHLIB_PATH=327,39460 +export __LMOD_REF_COUNT_SHLIB_PATH;328,39588 +SHLIB_PATH=329,39624 +export SHLIB_PATH;330,39730 +_LMFILES_=331,39749 +export _LMFILES_;332,40104 +_ModuleTable_=333,40122 +export _ModuleTable_;334,42038 +__LMOD_DEFAULT_MODULES_LOADED__=335,42060 +export __LMOD_DEFAULT_MODULES_LOADED__;336,42095 +export MODULEPATH;342,42444 +_ModuleTable_=343,42463 +export _ModuleTable_;344,44379 +export MODULEPATH;350,44712 +_ModuleTable_=351,44731 +export _ModuleTable_;352,46647 +unset FOO;358,46809 +unset GLOBUS_HOSTNAME;359,46820 +unset GLOBUS_LOCATION;360,46843 +unset GLOBUS_PATH;361,46866 +unset GLOBUS_TCP_PORT_RANGE;362,46885 +unset GPT_LOCATION;363,46914 +unset __LMOD_REF_COUNT_INFOPATH;364,46934 +unset INFOPATH;365,46967 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;366,46983 +unset LD_LIBRARY_PATH;367,47023 +unset __LMOD_REF_COUNT_LIBPATH;368,47046 +unset LIBPATH;369,47078 +unset LOADEDMODULES;370,47093 +unset __LMOD_REF_COUNT_MANPATH;371,47114 +unset MANPATH;372,47146 +__LMOD_REF_COUNT_MODULEPATH=373,47161 +export __LMOD_REF_COUNT_MODULEPATH;374,47258 +MODULEPATH=375,47294 +export MODULEPATH;376,47369 +unset MPICH_HOME;377,47388 +unset MYPROXY_SERVER;378,47406 +__LMOD_REF_COUNT_PATH=379,47428 +export __LMOD_REF_COUNT_PATH;380,47488 +PATH=381,47518 +export PATH;382,47556 +unset PGI;383,47569 +unset PURGE;384,47580 +unset RSHCOMMAND;385,47593 +unset RTM;386,47611 +unset SASL_PATH;387,47622 +unset __LMOD_REF_COUNT_SHLIB_PATH;388,47639 +unset SHLIB_PATH;389,47674 +unset _LMFILES_;390,47692 +_ModuleTable_=391,47709 +export _ModuleTable_;392,47907 +export __LMOD_REF_COUNT_MODULEPATH;408,48389 +MODULEPATH=409,48425 +export MODULEPATH;410,48452 +_ModuleTable_=411,48471 +export _ModuleTable_;412,48603 +export __LMOD_REF_COUNT_MODULEPATH;418,48866 +MODULEPATH=419,48902 +export MODULEPATH;420,48962 +_ModuleTable_=421,48981 +export _ModuleTable_;422,49148 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;428,49351 +LD_LIBRARY_PATH=429,49392 +export LD_LIBRARY_PATH;430,49421 +LMOD_FAMILY_RESOURCEMGR=431,49445 +export LMOD_FAMILY_RESOURCEMGR;432,49472 +LMOD_FAMILY_RESOURCEMGR_VERSION=433,49504 +export LMOD_FAMILY_RESOURCEMGR_VERSION;434,49543 +LMOD_FAMILY_SCHEDULER=435,49583 +export LMOD_FAMILY_SCHEDULER;436,49608 +LMOD_FAMILY_SCHEDULER_VERSION=437,49638 +export LMOD_FAMILY_SCHEDULER_VERSION;438,49675 +LOADEDMODULES=439,49713 +export LOADEDMODULES;440,49750 +__LMOD_REF_COUNT_MANPATH=441,49772 +export __LMOD_REF_COUNT_MANPATH;442,49839 +MANPATH=443,49872 +export MANPATH;444,49917 +MODULEPATH=445,49933 +export MODULEPATH;446,49993 +__LMOD_REF_COUNT_PATH=447,50012 +export __LMOD_REF_COUNT_PATH;448,50134 +PATH=449,50164 +export PATH;450,50252 +_LMFILES_=451,50265 +export _LMFILES_;452,50409 +_ModuleTable_=453,50427 +export _ModuleTable_;454,51140 +export MODULEPATH;460,51349 +_ModuleTable_=461,51368 +export _ModuleTable_;462,52081 +export MODULEPATH;468,52290 +_ModuleTable_=469,52309 +export _ModuleTable_;470,53022 +export LD_LIBRARY_PATH;476,53203 +LMOD_FAMILY_RESOURCEMGR=477,53227 +export LMOD_FAMILY_RESOURCEMGR;478,53254 +LMOD_FAMILY_RESOURCEMGR_VERSION=479,53286 +export LMOD_FAMILY_RESOURCEMGR_VERSION;480,53325 +LMOD_FAMILY_SCHEDULER=481,53365 +export LMOD_FAMILY_SCHEDULER;482,53390 +LMOD_FAMILY_SCHEDULER_VERSION=483,53420 +export LMOD_FAMILY_SCHEDULER_VERSION;484,53457 +MANPATH=485,53495 +export MANPATH;486,53540 +MODULEPATH=487,53556 +export MODULEPATH;488,53616 +PATH=489,53635 +export PATH;490,53723 +_ModuleTable_=491,53736 +export _ModuleTable_;492,54449 +__LMOD_DEFAULT_MODULES_LOADED__=493,54471 +export __LMOD_DEFAULT_MODULES_LOADED__;494,54506 +export MODULEPATH;500,54733 +_ModuleTable_=501,54752 +export _ModuleTable_;502,55465 +unset LD_LIBRARY_PATH;508,55655 +unset LMOD_FAMILY_RESOURCEMGR;509,55678 +unset LMOD_FAMILY_RESOURCEMGR_VERSION;510,55709 +unset LMOD_FAMILY_SCHEDULER;511,55748 +unset LMOD_FAMILY_SCHEDULER_VERSION;512,55777 +unset LOADEDMODULES;513,55814 +unset __LMOD_REF_COUNT_MANPATH;514,55835 +unset MANPATH;515,55867 +MODULEPATH=516,55882 +export MODULEPATH;517,55942 +__LMOD_REF_COUNT_PATH=518,55961 +export __LMOD_REF_COUNT_PATH;519,56021 +PATH=520,56051 +export PATH;521,56089 +unset _LMFILES_;522,56102 +_ModuleTable_=523,56119 +export _ModuleTable_;524,56286 +export LOADEDMODULES;530,56466 +__LMOD_REF_COUNT_MANPATH=531,56488 +export __LMOD_REF_COUNT_MANPATH;532,56571 +MANPATH=533,56604 +export MANPATH;534,56665 +MODULEPATH=535,56681 +export MODULEPATH;536,56741 +__LMOD_REF_COUNT_PATH=537,56760 +export __LMOD_REF_COUNT_PATH;538,56878 +PATH=539,56908 +export PATH;540,56998 +_LMFILES_=541,57011 +export _LMFILES_;542,57064 +_ModuleTable_=543,57082 +export _ModuleTable_;544,57527 +export MODULEPATH;550,57736 +_ModuleTable_=551,57755 +export _ModuleTable_;552,58200 +export LOADEDMODULES;558,58379 +__LMOD_REF_COUNT_MANPATH=559,58401 +export __LMOD_REF_COUNT_MANPATH;560,58484 +MANPATH=561,58517 +export MANPATH;562,58578 +MODULEPATH=563,58594 +export MODULEPATH;564,58654 +__LMOD_REF_COUNT_PATH=565,58673 +export __LMOD_REF_COUNT_PATH;566,58791 +PATH=567,58821 +export PATH;568,58911 +_LMFILES_=569,58924 +export _LMFILES_;570,58977 +_ModuleTable_=571,58995 +export _ModuleTable_;572,59440 +__LMOD_DEFAULT_MODULES_LOADED__=573,59462 +export __LMOD_DEFAULT_MODULES_LOADED__;574,59497 +export MODULEPATH;580,59724 +_ModuleTable_=581,59743 +export _ModuleTable_;582,60188 +unset __LMOD_REF_COUNT_MANPATH;588,60359 +unset MANPATH;589,60391 +MODULEPATH=590,60406 +export MODULEPATH;591,60466 +__LMOD_REF_COUNT_PATH=592,60485 +export __LMOD_REF_COUNT_PATH;593,60545 +PATH=594,60575 +export PATH;595,60613 +unset _LMFILES_;596,60626 +_ModuleTable_=597,60643 +export _ModuleTable_;598,60810 +export LOADEDMODULES;604,60989 +__LMOD_REF_COUNT_MANPATH=605,61011 +export __LMOD_REF_COUNT_MANPATH;606,61094 +MANPATH=607,61127 +export MANPATH;608,61188 +MODULEPATH=609,61204 +export MODULEPATH;610,61264 +__LMOD_REF_COUNT_PATH=611,61283 +export __LMOD_REF_COUNT_PATH;612,61401 +PATH=613,61431 +export PATH;614,61521 +_LMFILES_=615,61534 +export _LMFILES_;616,61587 +_ModuleTable_=617,61605 +export _ModuleTable_;618,62058 +__LMOD_DEFAULT_MODULES_LOADED__=619,62080 +export __LMOD_DEFAULT_MODULES_LOADED__;620,62115 +export MODULEPATH;626,62342 +_ModuleTable_=627,62361 +export _ModuleTable_;628,62814 +unset __LMOD_REF_COUNT_MANPATH;634,62985 +unset MANPATH;635,63017 +MODULEPATH=636,63032 +export MODULEPATH;637,63092 +__LMOD_REF_COUNT_PATH=638,63111 +export __LMOD_REF_COUNT_PATH;639,63171 +PATH=640,63201 +export PATH;641,63239 +unset _LMFILES_;642,63252 +_ModuleTable_=643,63269 +export _ModuleTable_;644,63436 +export __LMOD_REF_COUNT_MODULEPATH;650,63727 +MODULEPATH=651,63763 +export MODULEPATH;652,63852 +_ModuleTable_=653,63871 +export _ModuleTable_;654,64069 +export LOADEDMODULES;660,64280 +MODULEPATH=661,64302 +export MODULEPATH;662,64391 +_LMFILES_=663,64410 +export _LMFILES_;664,64559 +_ModuleTable_=665,64577 +export _ModuleTable_;666,65381 +binutils=667,65403 +export binutils;668,65419 +numactl=669,65436 +export numactl;670,65453 +export MODULEPATH;676,65685 +_ModuleTable_=677,65704 +export _ModuleTable_;678,66508 +export MODULEPATH;684,66751 +_ModuleTable_=685,66770 +export _ModuleTable_;686,67574 +export MODULEPATH;692,67820 +_ModuleTable_=693,67839 +export _ModuleTable_;694,68643 +binutils=695,68665 +export binutils;696,68681 +numactl=697,68698 +export numactl;698,68715 +export MODULEPATH;704,68947 +_ModuleTable_=705,68966 +export _ModuleTable_;706,69770 +MODULEPATH=712,69941 +export MODULEPATH;713,70030 +unset _LMFILES_;714,70049 +_ModuleTable_=715,70066 +export _ModuleTable_;716,70264 +unset binutils;717,70286 +unset numactl;718,70302 +export LOADEDMODULES;724,70467 +__LMOD_REF_COUNT_MANPATH=725,70489 +export __LMOD_REF_COUNT_MANPATH;726,70543 +MANPATH=727,70576 +export MANPATH;728,70611 +__LMOD_REF_COUNT_MODULEPATH=729,70627 +export __LMOD_REF_COUNT_MODULEPATH;730,70689 +MODULEPATH=731,70725 +export MODULEPATH;732,70768 +__LMOD_REF_COUNT_PATH=733,70787 +export __LMOD_REF_COUNT_PATH;734,70876 +PATH=735,70906 +export PATH;736,70970 +_LMFILES_=737,70983 +export _LMFILES_;738,71031 +_ModuleTable_=739,71049 +export _ModuleTable_;740,71363 +export MODULEPATH;746,71560 +_ModuleTable_=747,71579 +export _ModuleTable_;748,71893 +unset __LMOD_REF_COUNT_MANPATH;754,72064 +unset MANPATH;755,72096 +MODULEPATH=756,72111 +export MODULEPATH;757,72154 +__LMOD_REF_COUNT_PATH=758,72173 +export __LMOD_REF_COUNT_PATH;759,72233 +PATH=760,72263 +export PATH;761,72301 +unset _LMFILES_;762,72314 +_ModuleTable_=763,72331 +export _ModuleTable_;764,72495 +export LOADEDMODULES;770,72673 +__LMOD_REF_COUNT_MANPATH=771,72695 +export __LMOD_REF_COUNT_MANPATH;772,72749 +MANPATH=773,72782 +export MANPATH;774,72817 +MODULEPATH=775,72833 +export MODULEPATH;776,72876 +__LMOD_REF_COUNT_PATH=777,72895 +export __LMOD_REF_COUNT_PATH;778,72984 +PATH=779,73014 +export PATH;780,73078 +_LMFILES_=781,73091 +export _LMFILES_;782,73139 +_ModuleTable_=783,73157 +export _ModuleTable_;784,73475 +unset __LMOD_REF_COUNT_MANPATH;790,73646 +unset MANPATH;791,73678 +MODULEPATH=792,73693 +export MODULEPATH;793,73736 +__LMOD_REF_COUNT_PATH=794,73755 +export __LMOD_REF_COUNT_PATH;795,73815 +PATH=796,73845 +export PATH;797,73883 +unset _LMFILES_;798,73896 +_ModuleTable_=799,73913 +export _ModuleTable_;800,74077 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;806,74335 +LD_LIBRARY_PATH=807,74376 +export LD_LIBRARY_PATH;808,74453 +LOADEDMODULES=809,74477 +export LOADEDMODULES;810,74516 +__LMOD_REF_COUNT_MODULEPATH=811,74538 +export __LMOD_REF_COUNT_MODULEPATH;812,74649 +MODULEPATH=813,74685 +export MODULEPATH;814,74774 +__LMOD_REF_COUNT_PATH=815,74793 +export __LMOD_REF_COUNT_PATH;816,74919 +PATH=817,74949 +export PATH;818,75047 +_LMFILES_=819,75060 +export _LMFILES_;820,75165 +_ModuleTable_=821,75183 +export _ModuleTable_;822,75963 +export MODULEPATH;828,76210 +_ModuleTable_=829,76229 +export _ModuleTable_;830,77009 +unset LD_LIBRARY_PATH;836,77199 +unset LOADEDMODULES;837,77222 +__LMOD_REF_COUNT_MODULEPATH=838,77243 +export __LMOD_REF_COUNT_MODULEPATH;839,77305 +MODULEPATH=840,77341 +export MODULEPATH;841,77384 +__LMOD_REF_COUNT_PATH=842,77403 +export __LMOD_REF_COUNT_PATH;843,77463 +PATH=844,77493 +export PATH;845,77531 +unset _LMFILES_;846,77544 +_ModuleTable_=847,77561 +export _ModuleTable_;848,77725 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;854,77985 +LD_LIBRARY_PATH=855,78026 +export LD_LIBRARY_PATH;856,78103 +LOADEDMODULES=857,78127 +export LOADEDMODULES;858,78166 +__LMOD_REF_COUNT_MODULEPATH=859,78188 +export __LMOD_REF_COUNT_MODULEPATH;860,78299 +MODULEPATH=861,78335 +export MODULEPATH;862,78424 +__LMOD_REF_COUNT_PATH=863,78443 +export __LMOD_REF_COUNT_PATH;864,78569 +PATH=865,78599 +export PATH;866,78697 +_LMFILES_=867,78710 +export _LMFILES_;868,78815 +_ModuleTable_=869,78833 +export _ModuleTable_;870,79627 rt/saverestore/SitePackage.lua,19 function foo(3,20 @@ -4562,7 +4560,7 @@ rt/ifur/mf/minerva/all/Core/gompi/2.9.11,51 proc ModulesHelp 3,10 module-whatis whatis9,173 -rt/ifur/out.txt,7277 +rt/ifur/out.txt,7283 export EASYBUILD_ALLOW_MODULES_TOOL_MISMATCH;10,308 EASYBUILD_BUILDPATH=11,354 export EASYBUILD_BUILDPATH;12,390 @@ -4609,195 +4607,195 @@ export PYTHONPATH;52,2145 _LMFILES_=53,2164 export _LMFILES_;54,2263 _ModuleTable_=55,2281 -export _ModuleTable_;56,2872 -export MODULEPATH;62,3099 -_ModuleTable_=63,3118 -export _ModuleTable_;64,3709 -export __LMOD_REF_COUNT_CPATH;70,3936 -CPATH=71,3967 -export CPATH;72,4023 -EBDEVELGCC=73,4037 -export EBDEVELGCC;74,4131 -EBROOTGCC=75,4150 -export EBROOTGCC;76,4202 -EBVERSIONGCC=77,4220 -export EBVERSIONGCC;78,4240 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=79,4261 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;80,4475 -LD_LIBRARY_PATH=81,4516 -export LD_LIBRARY_PATH;82,4705 -__LMOD_REF_COUNT_LIBRARY_PATH=83,4729 -export __LMOD_REF_COUNT_LIBRARY_PATH;84,4857 -LIBRARY_PATH=85,4895 -export LIBRARY_PATH;86,5001 -LOADEDMODULES=87,5022 -export LOADEDMODULES;88,5073 -__LMOD_REF_COUNT_MANPATH=89,5095 -export __LMOD_REF_COUNT_MANPATH;90,5174 -MANPATH=91,5207 -export MANPATH;92,5267 -__LMOD_REF_COUNT_MODULEPATH=93,5283 -export __LMOD_REF_COUNT_MODULEPATH;94,5439 -MODULEPATH=95,5475 -export MODULEPATH;96,5606 -__LMOD_REF_COUNT_PATH=97,5625 -export __LMOD_REF_COUNT_PATH;98,5750 -PATH=99,5780 -export PATH;100,5877 -_LMFILES_=101,5890 -export _LMFILES_;102,6038 -_ModuleTable_=103,6056 -export _ModuleTable_;104,6892 -export MODULEPATH;110,7172 -_ModuleTable_=111,7191 -export _ModuleTable_;112,8027 -export __LMOD_REF_COUNT_CPATH;118,8328 -CPATH=119,8359 -export CPATH;120,8482 -EBDEVELOPENMPI=121,8496 -export EBDEVELOPENMPI;122,8630 -EBROOTOPENMPI=123,8653 -export EBROOTOPENMPI;124,8727 -EBVERSIONOPENMPI=125,8749 -export EBVERSIONOPENMPI;126,8773 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=127,8798 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;128,9078 -LD_LIBRARY_PATH=129,9119 -export LD_LIBRARY_PATH;130,9371 -__LMOD_REF_COUNT_LIBRARY_PATH=131,9395 -export __LMOD_REF_COUNT_LIBRARY_PATH;132,9589 -LIBRARY_PATH=133,9627 -export LIBRARY_PATH;134,9796 -LOADEDMODULES=135,9817 -export LOADEDMODULES;136,9882 -__LMOD_REF_COUNT_MANPATH=137,9904 -export __LMOD_REF_COUNT_MANPATH;138,10055 -MANPATH=139,10088 -export MANPATH;140,10217 -__LMOD_REF_COUNT_MODULEPATH=141,10233 -export __LMOD_REF_COUNT_MODULEPATH;142,10454 -MODULEPATH=143,10490 -export MODULEPATH;144,10683 -__LMOD_REF_COUNT_PATH=145,10702 -export __LMOD_REF_COUNT_PATH;146,10893 -PATH=147,10923 -export PATH;148,11083 -__LMOD_REF_COUNT_PKG_CONFIG_PATH=149,11096 -export __LMOD_REF_COUNT_PKG_CONFIG_PATH;150,11205 -PKG_CONFIG_PATH=151,11246 -export PKG_CONFIG_PATH;152,11336 -_LMFILES_=153,11360 -export _LMFILES_;154,11575 -_ModuleTable_=155,11593 -export _ModuleTable_;156,12713 -export __LMOD_REF_COUNT_CPATH;162,13229 -CPATH=163,13260 -export CPATH;164,13590 -EBDEVELGCC=165,13604 -export EBDEVELGCC;166,13698 -EBDEVELOPENBLAS=167,13717 -export EBDEVELOPENBLAS;168,13854 -EBDEVELOPENMPI=169,13878 -export EBDEVELOPENMPI;170,14012 -EBDEVELPYTHON=171,14035 -export EBDEVELPYTHON;172,14184 -EBDEVELZLIB=173,14206 -export EBDEVELZLIB;174,14331 -EBEXTSLISTPYTHON=175,14351 -export EBEXTSLISTPYTHON;176,14584 -EBROOTGCC=177,14609 -export EBROOTGCC;178,14661 -EBROOTOPENBLAS=179,14679 -export EBROOTOPENBLAS;180,14755 -EBROOTOPENMPI=181,14778 -export EBROOTOPENMPI;182,14852 -EBROOTPYTHON=183,14874 -export EBROOTPYTHON;184,14955 -EBROOTZLIB=185,14976 -export EBROOTZLIB;186,15044 -EBVERSIONGCC=187,15063 -export EBVERSIONGCC;188,15083 -EBVERSIONOPENBLAS=189,15104 -export EBVERSIONOPENBLAS;190,15129 -EBVERSIONOPENMPI=191,15155 -export EBVERSIONOPENMPI;192,15179 -EBVERSIONPYTHON=193,15204 -export EBVERSIONPYTHON;194,15227 -EBVERSIONZLIB=195,15251 -export EBVERSIONZLIB;196,15272 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=197,15294 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;198,15778 -LD_LIBRARY_PATH=199,15819 -export LD_LIBRARY_PATH;200,16266 -__LMOD_REF_COUNT_LIBRARY_PATH=201,16290 -export __LMOD_REF_COUNT_LIBRARY_PATH;202,16688 -LIBRARY_PATH=203,16726 -export LIBRARY_PATH;204,17090 -LOADEDMODULES=205,17111 -export LOADEDMODULES;206,17215 -__LMOD_REF_COUNT_MANPATH=207,17237 -export __LMOD_REF_COUNT_MANPATH;208,17537 -MANPATH=209,17570 -export MANPATH;210,17842 -MODULEPATH=211,17858 -export MODULEPATH;212,18051 -__LMOD_REF_COUNT_PATH=213,18070 -export __LMOD_REF_COUNT_PATH;214,18402 -PATH=215,18432 -export PATH;216,18727 -__LMOD_REF_COUNT_PKG_CONFIG_PATH=217,18740 -export __LMOD_REF_COUNT_PKG_CONFIG_PATH;218,19006 -PKG_CONFIG_PATH=219,19047 -export PKG_CONFIG_PATH;220,19288 -_LMFILES_=221,19312 -export _LMFILES_;222,19734 -_ModuleTable_=223,19752 -export _ModuleTable_;224,21553 -export MODULEPATH;230,21894 -_ModuleTable_=231,21913 -export _ModuleTable_;232,23714 -unset CPATH;238,23901 -unset EBDEVELGCC;239,23914 -unset EBDEVELOPENBLAS;240,23932 -unset EBDEVELOPENMPI;241,23955 -unset EBDEVELPYTHON;242,23977 -unset EBDEVELZLIB;243,23998 -unset EBEXTSLISTPYTHON;244,24017 -unset EBROOTGCC;245,24041 -unset EBROOTOPENBLAS;246,24058 -unset EBROOTOPENMPI;247,24080 -unset EBROOTPYTHON;248,24101 -unset EBROOTZLIB;249,24121 -unset EBVERSIONGCC;250,24139 -unset EBVERSIONOPENBLAS;251,24159 -unset EBVERSIONOPENMPI;252,24184 -unset EBVERSIONPYTHON;253,24208 -unset EBVERSIONZLIB;254,24231 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;255,24252 -unset LD_LIBRARY_PATH;256,24292 -unset __LMOD_REF_COUNT_LIBRARY_PATH;257,24315 -unset LIBRARY_PATH;258,24352 -LOADEDMODULES=259,24372 -export LOADEDMODULES;260,24413 -unset __LMOD_REF_COUNT_MANPATH;261,24435 -unset MANPATH;262,24467 -__LMOD_REF_COUNT_MODULEPATH=263,24482 -export __LMOD_REF_COUNT_MODULEPATH;264,24582 -MODULEPATH=265,24618 -export MODULEPATH;266,24696 -__LMOD_REF_COUNT_PATH=267,24715 -export __LMOD_REF_COUNT_PATH;268,24792 -PATH=269,24822 -export PATH;270,24874 -unset __LMOD_REF_COUNT_PKG_CONFIG_PATH;271,24887 -unset PKG_CONFIG_PATH;272,24927 -_LMFILES_=273,24950 -export _LMFILES_;274,25049 -_ModuleTable_=275,25067 -export _ModuleTable_;276,25658 -export MODULEPATH;282,25885 -_ModuleTable_=283,25904 -export _ModuleTable_;284,26495 +export _ModuleTable_;56,2957 +export MODULEPATH;62,3184 +_ModuleTable_=63,3203 +export _ModuleTable_;64,3879 +export __LMOD_REF_COUNT_CPATH;70,4106 +CPATH=71,4137 +export CPATH;72,4193 +EBDEVELGCC=73,4207 +export EBDEVELGCC;74,4301 +EBROOTGCC=75,4320 +export EBROOTGCC;76,4372 +EBVERSIONGCC=77,4390 +export EBVERSIONGCC;78,4410 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=79,4431 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;80,4645 +LD_LIBRARY_PATH=81,4686 +export LD_LIBRARY_PATH;82,4875 +__LMOD_REF_COUNT_LIBRARY_PATH=83,4899 +export __LMOD_REF_COUNT_LIBRARY_PATH;84,5027 +LIBRARY_PATH=85,5065 +export LIBRARY_PATH;86,5171 +LOADEDMODULES=87,5192 +export LOADEDMODULES;88,5243 +__LMOD_REF_COUNT_MANPATH=89,5265 +export __LMOD_REF_COUNT_MANPATH;90,5344 +MANPATH=91,5377 +export MANPATH;92,5437 +__LMOD_REF_COUNT_MODULEPATH=93,5453 +export __LMOD_REF_COUNT_MODULEPATH;94,5609 +MODULEPATH=95,5645 +export MODULEPATH;96,5776 +__LMOD_REF_COUNT_PATH=97,5795 +export __LMOD_REF_COUNT_PATH;98,5920 +PATH=99,5950 +export PATH;100,6047 +_LMFILES_=101,6060 +export _LMFILES_;102,6208 +_ModuleTable_=103,6226 +export _ModuleTable_;104,7246 +export MODULEPATH;110,7526 +_ModuleTable_=111,7545 +export _ModuleTable_;112,8565 +export __LMOD_REF_COUNT_CPATH;118,8866 +CPATH=119,8897 +export CPATH;120,9020 +EBDEVELOPENMPI=121,9034 +export EBDEVELOPENMPI;122,9168 +EBROOTOPENMPI=123,9191 +export EBROOTOPENMPI;124,9265 +EBVERSIONOPENMPI=125,9287 +export EBVERSIONOPENMPI;126,9311 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=127,9336 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;128,9616 +LD_LIBRARY_PATH=129,9657 +export LD_LIBRARY_PATH;130,9909 +__LMOD_REF_COUNT_LIBRARY_PATH=131,9933 +export __LMOD_REF_COUNT_LIBRARY_PATH;132,10127 +LIBRARY_PATH=133,10165 +export LIBRARY_PATH;134,10334 +LOADEDMODULES=135,10355 +export LOADEDMODULES;136,10420 +__LMOD_REF_COUNT_MANPATH=137,10442 +export __LMOD_REF_COUNT_MANPATH;138,10593 +MANPATH=139,10626 +export MANPATH;140,10755 +__LMOD_REF_COUNT_MODULEPATH=141,10771 +export __LMOD_REF_COUNT_MODULEPATH;142,10992 +MODULEPATH=143,11028 +export MODULEPATH;144,11221 +__LMOD_REF_COUNT_PATH=145,11240 +export __LMOD_REF_COUNT_PATH;146,11431 +PATH=147,11461 +export PATH;148,11621 +__LMOD_REF_COUNT_PKG_CONFIG_PATH=149,11634 +export __LMOD_REF_COUNT_PKG_CONFIG_PATH;150,11743 +PKG_CONFIG_PATH=151,11784 +export PKG_CONFIG_PATH;152,11874 +_LMFILES_=153,11898 +export _LMFILES_;154,12113 +_ModuleTable_=155,12131 +export _ModuleTable_;156,13543 +export __LMOD_REF_COUNT_CPATH;162,14059 +CPATH=163,14090 +export CPATH;164,14420 +EBDEVELGCC=165,14434 +export EBDEVELGCC;166,14528 +EBDEVELOPENBLAS=167,14547 +export EBDEVELOPENBLAS;168,14684 +EBDEVELOPENMPI=169,14708 +export EBDEVELOPENMPI;170,14842 +EBDEVELPYTHON=171,14865 +export EBDEVELPYTHON;172,15014 +EBDEVELZLIB=173,15036 +export EBDEVELZLIB;174,15161 +EBEXTSLISTPYTHON=175,15181 +export EBEXTSLISTPYTHON;176,15414 +EBROOTGCC=177,15439 +export EBROOTGCC;178,15491 +EBROOTOPENBLAS=179,15509 +export EBROOTOPENBLAS;180,15585 +EBROOTOPENMPI=181,15608 +export EBROOTOPENMPI;182,15682 +EBROOTPYTHON=183,15704 +export EBROOTPYTHON;184,15785 +EBROOTZLIB=185,15806 +export EBROOTZLIB;186,15874 +EBVERSIONGCC=187,15893 +export EBVERSIONGCC;188,15913 +EBVERSIONOPENBLAS=189,15934 +export EBVERSIONOPENBLAS;190,15959 +EBVERSIONOPENMPI=191,15985 +export EBVERSIONOPENMPI;192,16009 +EBVERSIONPYTHON=193,16034 +export EBVERSIONPYTHON;194,16057 +EBVERSIONZLIB=195,16081 +export EBVERSIONZLIB;196,16102 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=197,16124 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;198,16608 +LD_LIBRARY_PATH=199,16649 +export LD_LIBRARY_PATH;200,17096 +__LMOD_REF_COUNT_LIBRARY_PATH=201,17120 +export __LMOD_REF_COUNT_LIBRARY_PATH;202,17518 +LIBRARY_PATH=203,17556 +export LIBRARY_PATH;204,17920 +LOADEDMODULES=205,17941 +export LOADEDMODULES;206,18045 +__LMOD_REF_COUNT_MANPATH=207,18067 +export __LMOD_REF_COUNT_MANPATH;208,18367 +MANPATH=209,18400 +export MANPATH;210,18672 +MODULEPATH=211,18688 +export MODULEPATH;212,18881 +__LMOD_REF_COUNT_PATH=213,18900 +export __LMOD_REF_COUNT_PATH;214,19232 +PATH=215,19262 +export PATH;216,19557 +__LMOD_REF_COUNT_PKG_CONFIG_PATH=217,19570 +export __LMOD_REF_COUNT_PKG_CONFIG_PATH;218,19836 +PKG_CONFIG_PATH=219,19877 +export PKG_CONFIG_PATH;220,20118 +_LMFILES_=221,20142 +export _LMFILES_;222,20564 +_ModuleTable_=223,20582 +export _ModuleTable_;224,22675 +export MODULEPATH;230,23016 +_ModuleTable_=231,23035 +export _ModuleTable_;232,25128 +unset CPATH;238,25315 +unset EBDEVELGCC;239,25328 +unset EBDEVELOPENBLAS;240,25346 +unset EBDEVELOPENMPI;241,25369 +unset EBDEVELPYTHON;242,25391 +unset EBDEVELZLIB;243,25412 +unset EBEXTSLISTPYTHON;244,25431 +unset EBROOTGCC;245,25455 +unset EBROOTOPENBLAS;246,25472 +unset EBROOTOPENMPI;247,25494 +unset EBROOTPYTHON;248,25515 +unset EBROOTZLIB;249,25535 +unset EBVERSIONGCC;250,25553 +unset EBVERSIONOPENBLAS;251,25573 +unset EBVERSIONOPENMPI;252,25598 +unset EBVERSIONPYTHON;253,25622 +unset EBVERSIONZLIB;254,25645 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;255,25666 +unset LD_LIBRARY_PATH;256,25706 +unset __LMOD_REF_COUNT_LIBRARY_PATH;257,25729 +unset LIBRARY_PATH;258,25766 +LOADEDMODULES=259,25786 +export LOADEDMODULES;260,25827 +unset __LMOD_REF_COUNT_MANPATH;261,25849 +unset MANPATH;262,25881 +__LMOD_REF_COUNT_MODULEPATH=263,25896 +export __LMOD_REF_COUNT_MODULEPATH;264,25996 +MODULEPATH=265,26032 +export MODULEPATH;266,26110 +__LMOD_REF_COUNT_PATH=267,26129 +export __LMOD_REF_COUNT_PATH;268,26206 +PATH=269,26236 +export PATH;270,26288 +unset __LMOD_REF_COUNT_PKG_CONFIG_PATH;271,26301 +unset PKG_CONFIG_PATH;272,26341 +_LMFILES_=273,26364 +export _LMFILES_;274,26463 +_ModuleTable_=275,26481 +export _ModuleTable_;276,27157 +export MODULEPATH;282,27384 +_ModuleTable_=283,27403 +export _ModuleTable_;284,28079 rt/ifur/readme,272 <_boegel_> ifur: what you *should* end up with,2,105 @@ -4847,46 +4845,46 @@ export PATH;62,3139 _LMFILES_=63,3152 export _LMFILES_;64,3251 _ModuleTable_=65,3269 -export _ModuleTable_;66,3879 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;72,4100 -LD_LIBRARY_PATH=73,4141 -export LD_LIBRARY_PATH;74,4189 -LOADEDMODULES=75,4213 -export LOADEDMODULES;76,4241 -__LMOD_REF_COUNT_MODULEPATH=77,4263 -export __LMOD_REF_COUNT_MODULEPATH;78,4398 -MODULEPATH=79,4434 -export MODULEPATH;80,4544 -__LMOD_REF_COUNT_PATH=81,4563 -export __LMOD_REF_COUNT_PATH;82,4657 -PATH=83,4687 -export PATH;84,4756 -_LMFILES_=85,4769 -export _LMFILES_;86,4825 -_ModuleTable_=87,4843 -export _ModuleTable_;88,5268 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;94,5519 -LD_LIBRARY_PATH=95,5560 -export LD_LIBRARY_PATH;96,5637 -LOADEDMODULES=97,5661 -export LOADEDMODULES;98,5700 -__LMOD_REF_COUNT_MODULEPATH=99,5722 -export __LMOD_REF_COUNT_MODULEPATH;100,5857 -MODULEPATH=101,5893 -export MODULEPATH;102,6003 -__LMOD_REF_COUNT_PATH=103,6022 -export __LMOD_REF_COUNT_PATH;104,6148 -PATH=105,6178 -export PATH;106,6276 -_LMFILES_=107,6289 -export _LMFILES_;108,6388 -_ModuleTable_=109,6406 -export _ModuleTable_;110,7016 -export __LMOD_REF_COUNT_MODULEPATH;116,7297 -MODULEPATH=117,7333 -export MODULEPATH;118,7400 -_ModuleTable_=119,7419 -export _ModuleTable_;120,7984 +export _ModuleTable_;66,4057 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;72,4278 +LD_LIBRARY_PATH=73,4319 +export LD_LIBRARY_PATH;74,4367 +LOADEDMODULES=75,4391 +export LOADEDMODULES;76,4419 +__LMOD_REF_COUNT_MODULEPATH=77,4441 +export __LMOD_REF_COUNT_MODULEPATH;78,4576 +MODULEPATH=79,4612 +export MODULEPATH;80,4722 +__LMOD_REF_COUNT_PATH=81,4741 +export __LMOD_REF_COUNT_PATH;82,4835 +PATH=83,4865 +export PATH;84,4934 +_LMFILES_=85,4947 +export _LMFILES_;86,5003 +_ModuleTable_=87,5021 +export _ModuleTable_;88,5535 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;94,5786 +LD_LIBRARY_PATH=95,5827 +export LD_LIBRARY_PATH;96,5904 +LOADEDMODULES=97,5928 +export LOADEDMODULES;98,5967 +__LMOD_REF_COUNT_MODULEPATH=99,5989 +export __LMOD_REF_COUNT_MODULEPATH;100,6124 +MODULEPATH=101,6160 +export MODULEPATH;102,6270 +__LMOD_REF_COUNT_PATH=103,6289 +export __LMOD_REF_COUNT_PATH;104,6415 +PATH=105,6445 +export PATH;106,6543 +_LMFILES_=107,6556 +export _LMFILES_;108,6655 +_ModuleTable_=109,6673 +export _ModuleTable_;110,7461 +export __LMOD_REF_COUNT_MODULEPATH;116,7742 +MODULEPATH=117,7778 +export MODULEPATH;118,7845 +_ModuleTable_=119,7864 +export _ModuleTable_;120,8607 rt/hook/hook.tdesc,21 local testName 3,16 @@ -4931,64 +4929,64 @@ export PATH;46,2337 _LMFILES_=47,2350 export _LMFILES_;48,2451 _ModuleTable_=49,2469 -export _ModuleTable_;50,3002 -export ADMIN_MODULE_LOADED;56,3185 -LD_LIBRARY_PATH=57,3213 -export LD_LIBRARY_PATH;58,3346 -LMOD_FAMILY_COMPILER=59,3370 -export LMOD_FAMILY_COMPILER;60,3398 -LMOD_FAMILY_COMPILER_VERSION=61,3427 -export LMOD_FAMILY_COMPILER_VERSION;62,3463 -MANPATH=63,3500 -export MANPATH;64,3621 -MKL_DIR=65,3637 -export MKL_DIR;66,3679 -MKL_INCLUDE=67,3695 -export MKL_INCLUDE;68,3741 -MODULEPATH=69,3761 -export MODULEPATH;70,3842 -PATH=71,3861 -export PATH;72,3998 -_ModuleTable_=73,4011 -export _ModuleTable_;74,4544 -export ADMIN_MODULE_LOADED;80,4727 -LD_LIBRARY_PATH=81,4755 -export LD_LIBRARY_PATH;82,4888 -LMOD_FAMILY_COMPILER=83,4912 -export LMOD_FAMILY_COMPILER;84,4940 -LMOD_FAMILY_COMPILER_VERSION=85,4969 -export LMOD_FAMILY_COMPILER_VERSION;86,5005 -MANPATH=87,5042 -export MANPATH;88,5163 -MKL_DIR=89,5179 -export MKL_DIR;90,5221 -MKL_INCLUDE=91,5237 -export MKL_INCLUDE;92,5283 -MODULEPATH=93,5303 -export MODULEPATH;94,5384 -PATH=95,5403 -export PATH;96,5540 -_ModuleTable_=97,5553 -export _ModuleTable_;98,6086 -export ADMIN_MODULE_LOADED;104,6269 -LD_LIBRARY_PATH=105,6297 -export LD_LIBRARY_PATH;106,6430 -LMOD_FAMILY_COMPILER=107,6454 -export LMOD_FAMILY_COMPILER;108,6482 -LMOD_FAMILY_COMPILER_VERSION=109,6511 -export LMOD_FAMILY_COMPILER_VERSION;110,6547 -MANPATH=111,6584 -export MANPATH;112,6705 -MKL_DIR=113,6721 -export MKL_DIR;114,6763 -MKL_INCLUDE=115,6779 -export MKL_INCLUDE;116,6825 -MODULEPATH=117,6845 -export MODULEPATH;118,6926 -PATH=119,6945 -export PATH;120,7082 -_ModuleTable_=121,7095 -export _ModuleTable_;122,7628 +export _ModuleTable_;50,3090 +export ADMIN_MODULE_LOADED;56,3273 +LD_LIBRARY_PATH=57,3301 +export LD_LIBRARY_PATH;58,3434 +LMOD_FAMILY_COMPILER=59,3458 +export LMOD_FAMILY_COMPILER;60,3486 +LMOD_FAMILY_COMPILER_VERSION=61,3515 +export LMOD_FAMILY_COMPILER_VERSION;62,3551 +MANPATH=63,3588 +export MANPATH;64,3709 +MKL_DIR=65,3725 +export MKL_DIR;66,3767 +MKL_INCLUDE=67,3783 +export MKL_INCLUDE;68,3829 +MODULEPATH=69,3849 +export MODULEPATH;70,3930 +PATH=71,3949 +export PATH;72,4086 +_ModuleTable_=73,4099 +export _ModuleTable_;74,4720 +export ADMIN_MODULE_LOADED;80,4903 +LD_LIBRARY_PATH=81,4931 +export LD_LIBRARY_PATH;82,5064 +LMOD_FAMILY_COMPILER=83,5088 +export LMOD_FAMILY_COMPILER;84,5116 +LMOD_FAMILY_COMPILER_VERSION=85,5145 +export LMOD_FAMILY_COMPILER_VERSION;86,5181 +MANPATH=87,5218 +export MANPATH;88,5339 +MKL_DIR=89,5355 +export MKL_DIR;90,5397 +MKL_INCLUDE=91,5413 +export MKL_INCLUDE;92,5459 +MODULEPATH=93,5479 +export MODULEPATH;94,5560 +PATH=95,5579 +export PATH;96,5716 +_ModuleTable_=97,5729 +export _ModuleTable_;98,6350 +export ADMIN_MODULE_LOADED;104,6533 +LD_LIBRARY_PATH=105,6561 +export LD_LIBRARY_PATH;106,6694 +LMOD_FAMILY_COMPILER=107,6718 +export LMOD_FAMILY_COMPILER;108,6746 +LMOD_FAMILY_COMPILER_VERSION=109,6775 +export LMOD_FAMILY_COMPILER_VERSION;110,6811 +MANPATH=111,6848 +export MANPATH;112,6969 +MKL_DIR=113,6985 +export MKL_DIR;114,7027 +MKL_INCLUDE=115,7043 +export MKL_INCLUDE;116,7089 +MODULEPATH=117,7109 +export MODULEPATH;118,7190 +PATH=119,7209 +export PATH;120,7346 +_ModuleTable_=121,7359 +export _ModuleTable_;122,7980 rt/dynamic_spider/out.txt,1542 export __LMOD_REF_COUNT_MODULEPATH;10,327 @@ -5041,10 +5039,10 @@ export MODULEPATH;106,5174 _LMFILES_=107,5193 export _LMFILES_;108,5256 _ModuleTable_=109,5274 -export _ModuleTable_;110,5742 -export MODULEPATH;116,6033 -_ModuleTable_=117,6052 -export _ModuleTable_;118,6520 +export _ModuleTable_;110,5905 +export MODULEPATH;116,6196 +_ModuleTable_=117,6215 +export _ModuleTable_;118,6846 rt/dynamic_spider/dynamic_spider.tdesc,21 local testName 2,15 @@ -5205,12 +5203,12 @@ export MODULEPATH;157,4334 _LMFILES_=158,4353 export _LMFILES_;159,4401 _ModuleTable_=160,4419 -export _ModuleTable_;161,4754 -export MODULEPATH;167,4970 -_ModuleTable_=168,4989 -export _ModuleTable_;169,5324 -dbT 177,5500 -provideByT 207,6188 +export _ModuleTable_;161,4822 +export MODULEPATH;167,5038 +_ModuleTable_=168,5057 +export _ModuleTable_;169,5460 +dbT 177,5636 +provideByT 207,6324 rt/dbT/dbT.tdesc,21 local testName 2,15 @@ -5218,7 +5216,7 @@ local testName 2,15 rt/swap/swap.tdesc,19 testdescript 2,15 -rt/swap/out.txt,22496 +rt/swap/out.txt,22512 export ADMIN_MODULE_LOADED;10,310 __LMOD_REF_COUNT_INFOPATH=11,338 export __LMOD_REF_COUNT_INFOPATH;12,398 @@ -5269,683 +5267,683 @@ export TACC_PMETIS_LIB;56,3373 _LMFILES_=57,3397 export _LMFILES_;58,3791 _ModuleTable_=59,3809 -export _ModuleTable_;60,5561 -export MODULEPATH;66,5842 -_ModuleTable_=67,5861 -export _ModuleTable_;68,7613 -unset LD_LIBRARY_PATH;74,7809 -unset LMOD_FAMILY_COMPILER;75,7832 -unset LMOD_FAMILY_COMPILER_VERSION;76,7860 -unset LMOD_FAMILY_MPI;77,7896 -unset LMOD_FAMILY_MPI_VERSION;78,7919 -LOADEDMODULES=79,7950 -export LOADEDMODULES;80,8035 -__LMOD_REF_COUNT_MANPATH=81,8057 -export __LMOD_REF_COUNT_MANPATH;82,8130 -MANPATH=83,8163 -export MANPATH;84,8214 -unset MKL_DIR;85,8230 -unset MKL_INCLUDE;86,8245 -__LMOD_REF_COUNT_MODULEPATH=87,8264 -export __LMOD_REF_COUNT_MODULEPATH;88,8322 -MODULEPATH=89,8358 -export MODULEPATH;90,8397 -unset MPIHOME;91,8416 -__LMOD_REF_COUNT_PATH=92,8431 -export __LMOD_REF_COUNT_PATH;93,8596 -PATH=94,8626 -export PATH;95,8754 -TACC_PMETIS_BIN=96,8767 -export TACC_PMETIS_BIN;97,8815 -TACC_PMETIS_DIR=98,8839 -export TACC_PMETIS_DIR;99,8887 -TACC_PMETIS_DOC=100,8911 -export TACC_PMETIS_DOC;101,8966 -TACC_PMETIS_INC=102,8990 -export TACC_PMETIS_INC;103,9038 -TACC_PMETIS_LIB=104,9062 -export TACC_PMETIS_LIB;105,9110 -_LMFILES_=106,9134 -export _LMFILES_;107,9401 -_ModuleTable_=108,9419 -export _ModuleTable_;109,10855 -export MODULEPATH;115,11042 -_ModuleTable_=116,11061 -export _ModuleTable_;117,12497 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;123,12732 -LD_LIBRARY_PATH=124,12773 -export LD_LIBRARY_PATH;125,12837 -LMOD_FAMILY_COMPILER=126,12861 -export LMOD_FAMILY_COMPILER;127,12887 -LMOD_FAMILY_COMPILER_VERSION=128,12916 -export LMOD_FAMILY_COMPILER_VERSION;129,12952 -LMOD_FAMILY_MPI=130,12989 -export LMOD_FAMILY_MPI;131,13014 -LMOD_FAMILY_MPI_VERSION=132,13038 -export LMOD_FAMILY_MPI_VERSION;133,13069 -LOADEDMODULES=134,13101 -export LOADEDMODULES;135,13210 -__LMOD_REF_COUNT_MANPATH=136,13232 -export __LMOD_REF_COUNT_MANPATH;137,13355 -MANPATH=138,13388 -export MANPATH;139,13486 -__LMOD_REF_COUNT_MODULEPATH=140,13502 -export __LMOD_REF_COUNT_MODULEPATH;141,13657 -MODULEPATH=142,13693 -export MODULEPATH;143,13823 -MPIHOME=144,13842 -export MPIHOME;145,13894 -__LMOD_REF_COUNT_PATH=146,13910 -export __LMOD_REF_COUNT_PATH;147,14125 -PATH=148,14155 -export PATH;149,14330 -TACC_PMETIS_BIN=150,14343 -export TACC_PMETIS_BIN;151,14401 -TACC_PMETIS_DIR=152,14425 -export TACC_PMETIS_DIR;153,14483 -TACC_PMETIS_DOC=154,14507 -export TACC_PMETIS_DOC;155,14572 -TACC_PMETIS_INC=156,14596 -export TACC_PMETIS_INC;157,14654 -TACC_PMETIS_LIB=158,14678 -export TACC_PMETIS_LIB;159,14736 -_LMFILES_=160,14760 -export _LMFILES_;161,15150 -_ModuleTable_=162,15168 -export _ModuleTable_;163,16929 -export MODULEPATH;169,17207 -_ModuleTable_=170,17226 -export _ModuleTable_;171,18987 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;177,19357 -LD_LIBRARY_PATH=178,19398 -export LD_LIBRARY_PATH;179,19579 -LMOD_FAMILY_COMPILER=180,19603 -export LMOD_FAMILY_COMPILER;181,19631 -LMOD_FAMILY_COMPILER_VERSION=182,19660 -export LMOD_FAMILY_COMPILER_VERSION;183,19696 -LMOD_FAMILY_MPI=184,19733 -export LMOD_FAMILY_MPI;185,19758 -LMOD_FAMILY_MPI_VERSION=186,19782 -export LMOD_FAMILY_MPI_VERSION;187,19813 -LOADEDMODULES=188,19845 -export LOADEDMODULES;189,19956 -__LMOD_REF_COUNT_MANPATH=190,19978 -export __LMOD_REF_COUNT_MANPATH;191,20226 -MANPATH=192,20259 -export MANPATH;193,20470 -MKL_DIR=194,20486 -export MKL_DIR;195,20528 -MKL_INCLUDE=196,20544 -export MKL_INCLUDE;197,20590 -__LMOD_REF_COUNT_MODULEPATH=198,20610 -export __LMOD_REF_COUNT_MODULEPATH;199,20767 -MODULEPATH=200,20803 -export MODULEPATH;201,20935 -MPIHOME=202,20954 -export MPIHOME;203,21007 -__LMOD_REF_COUNT_PATH=204,21023 -export __LMOD_REF_COUNT_PATH;205,21331 -PATH=206,21361 -export PATH;207,21620 -TACC_PMETIS_BIN=208,21633 -export TACC_PMETIS_BIN;209,21692 -TACC_PMETIS_DIR=210,21716 -export TACC_PMETIS_DIR;211,21775 -TACC_PMETIS_DOC=212,21799 -export TACC_PMETIS_DOC;213,21865 -TACC_PMETIS_INC=214,21889 -export TACC_PMETIS_INC;215,21948 -TACC_PMETIS_LIB=216,21972 -export TACC_PMETIS_LIB;217,22031 -_LMFILES_=218,22055 -export _LMFILES_;219,22449 -_ModuleTable_=220,22467 -export _ModuleTable_;221,24219 -export LOADEDMODULES;227,24518 -MODULEPATH=228,24540 -export MODULEPATH;229,24672 -TACC_PETSC_VERSION=230,24691 -export TACC_PETSC_VERSION;231,24715 -TACC_PHDF5_DIR=232,24742 -export TACC_PHDF5_DIR;233,24778 -_LMFILES_=234,24801 -export _LMFILES_;235,25327 -_ModuleTable_=236,25345 -export _ModuleTable_;237,27518 -export MODULEPATH;243,27799 -_ModuleTable_=244,27818 -export _ModuleTable_;245,29991 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;251,30366 -LD_LIBRARY_PATH=252,30407 -export LD_LIBRARY_PATH;253,30587 -LMOD_FAMILY_MPI=254,30611 -export LMOD_FAMILY_MPI;255,30635 -LMOD_FAMILY_MPI_VERSION=256,30659 -export LMOD_FAMILY_MPI_VERSION;257,30690 -LOADEDMODULES=258,30722 -export LOADEDMODULES;259,30856 -__LMOD_REF_COUNT_MANPATH=260,30878 -export __LMOD_REF_COUNT_MANPATH;261,31125 -MANPATH=262,31158 -export MANPATH;263,31368 -__LMOD_REF_COUNT_MODULEPATH=264,31384 -export __LMOD_REF_COUNT_MODULEPATH;265,31540 -MODULEPATH=266,31576 -export MODULEPATH;267,31707 -MPIHOME=268,31726 -export MPIHOME;269,31778 -__LMOD_REF_COUNT_PATH=270,31794 -export __LMOD_REF_COUNT_PATH;271,32101 -PATH=272,32131 -export PATH;273,32389 -TACC_PETSC_VERSION=274,32402 -export TACC_PETSC_VERSION;275,32426 -unset TACC_PHDF5_DIR;276,32453 -TACC_PHDF5_VERSION=277,32475 -export TACC_PHDF5_VERSION;278,32501 -TACC_PMETIS_BIN=279,32528 -export TACC_PMETIS_BIN;280,32589 -TACC_PMETIS_DIR=281,32613 -export TACC_PMETIS_DIR;282,32674 -TACC_PMETIS_DOC=283,32698 -export TACC_PMETIS_DOC;284,32766 -TACC_PMETIS_INC=285,32790 -export TACC_PMETIS_INC;286,32851 -TACC_PMETIS_LIB=287,32875 -export TACC_PMETIS_LIB;288,32936 -_LMFILES_=289,32960 -export _LMFILES_;290,33484 -_ModuleTable_=291,33502 -export _ModuleTable_;292,35680 -export MODULEPATH;298,35960 -_ModuleTable_=299,35979 -export _ModuleTable_;300,38157 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;306,38533 -LD_LIBRARY_PATH=307,38574 -export LD_LIBRARY_PATH;308,38755 -LMOD_FAMILY_MPI=309,38779 -export LMOD_FAMILY_MPI;310,38804 -LMOD_FAMILY_MPI_VERSION=311,38828 -export LMOD_FAMILY_MPI_VERSION;312,38859 -LOADEDMODULES=313,38891 -export LOADEDMODULES;314,39024 -__LMOD_REF_COUNT_MANPATH=315,39046 -export __LMOD_REF_COUNT_MANPATH;316,39294 -MANPATH=317,39327 -export MANPATH;318,39538 -__LMOD_REF_COUNT_MODULEPATH=319,39554 -export __LMOD_REF_COUNT_MODULEPATH;320,39711 -MODULEPATH=321,39747 -export MODULEPATH;322,39879 -MPIHOME=323,39898 -export MPIHOME;324,39951 -__LMOD_REF_COUNT_PATH=325,39967 -export __LMOD_REF_COUNT_PATH;326,40275 -PATH=327,40305 -export PATH;328,40564 -TACC_PETSC_VERSION=329,40577 -export TACC_PETSC_VERSION;330,40601 -TACC_PHDF5_DIR=331,40628 -export TACC_PHDF5_DIR;332,40664 -unset TACC_PHDF5_VERSION;333,40687 -TACC_PMETIS_BIN=334,40713 -export TACC_PMETIS_BIN;335,40772 -TACC_PMETIS_DIR=336,40796 -export TACC_PMETIS_DIR;337,40855 -TACC_PMETIS_DOC=338,40879 -export TACC_PMETIS_DOC;339,40945 -TACC_PMETIS_INC=340,40969 -export TACC_PMETIS_INC;341,41028 -TACC_PMETIS_LIB=342,41052 -export TACC_PMETIS_LIB;343,41111 -_LMFILES_=344,41135 -export _LMFILES_;345,41661 -_ModuleTable_=346,41679 -export _ModuleTable_;347,43852 -export MODULEPATH;353,44133 -_ModuleTable_=354,44152 -export _ModuleTable_;355,46325 -export LOADEDMODULES;361,46614 -MODULEPATH=362,46636 -export MODULEPATH;363,46768 -TACC_PHDF5_DIR=364,46787 -export TACC_PHDF5_DIR;365,46823 -_LMFILES_=366,46846 -export _LMFILES_;367,47373 -_ModuleTable_=368,47391 -export _ModuleTable_;369,49560 -export MODULEPATH;375,49841 -_ModuleTable_=376,49860 -export _ModuleTable_;377,52029 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;383,52404 -LD_LIBRARY_PATH=384,52445 -export LD_LIBRARY_PATH;385,52625 -LMOD_FAMILY_MPI=386,52649 -export LMOD_FAMILY_MPI;387,52673 -LMOD_FAMILY_MPI_VERSION=388,52697 -export LMOD_FAMILY_MPI_VERSION;389,52728 -LOADEDMODULES=390,52760 -export LOADEDMODULES;391,52894 -__LMOD_REF_COUNT_MANPATH=392,52916 -export __LMOD_REF_COUNT_MANPATH;393,53163 -MANPATH=394,53196 -export MANPATH;395,53406 -__LMOD_REF_COUNT_MODULEPATH=396,53422 -export __LMOD_REF_COUNT_MODULEPATH;397,53578 -MODULEPATH=398,53614 -export MODULEPATH;399,53745 -MPIHOME=400,53764 -export MPIHOME;401,53816 -__LMOD_REF_COUNT_PATH=402,53832 -export __LMOD_REF_COUNT_PATH;403,54139 -PATH=404,54169 -export PATH;405,54427 -TACC_PETSC_VERSION=406,54440 -export TACC_PETSC_VERSION;407,54464 -unset TACC_PHDF5_DIR;408,54491 -TACC_PHDF5_VERSION=409,54513 -export TACC_PHDF5_VERSION;410,54539 -TACC_PMETIS_BIN=411,54566 -export TACC_PMETIS_BIN;412,54627 -TACC_PMETIS_DIR=413,54651 -export TACC_PMETIS_DIR;414,54712 -TACC_PMETIS_DOC=415,54736 -export TACC_PMETIS_DOC;416,54804 -TACC_PMETIS_INC=417,54828 -export TACC_PMETIS_INC;418,54889 -TACC_PMETIS_LIB=419,54913 -export TACC_PMETIS_LIB;420,54974 -_LMFILES_=421,54998 -export _LMFILES_;422,55522 -_ModuleTable_=423,55540 -export _ModuleTable_;424,57712 -export MODULEPATH;430,57992 -_ModuleTable_=431,58011 -export _ModuleTable_;432,60183 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;438,60502 -LD_LIBRARY_PATH=439,60543 -export LD_LIBRARY_PATH;440,60676 -unset LMOD_FAMILY_MPI;441,60700 -unset LMOD_FAMILY_MPI_VERSION;442,60723 -LOADEDMODULES=443,60754 -export LOADEDMODULES;444,60851 -__LMOD_REF_COUNT_MANPATH=445,60873 -export __LMOD_REF_COUNT_MANPATH;446,61070 -MANPATH=447,61103 -export MANPATH;448,61266 -__LMOD_REF_COUNT_MODULEPATH=449,61282 -export __LMOD_REF_COUNT_MODULEPATH;450,61385 -MODULEPATH=451,61421 -export MODULEPATH;452,61502 -unset MPIHOME;453,61521 -__LMOD_REF_COUNT_PATH=454,61536 -export __LMOD_REF_COUNT_PATH;455,61793 -PATH=456,61823 -export PATH;457,62034 -unset TACC_PETSC_VERSION;458,62047 -unset TACC_PHDF5_VERSION;459,62073 -TACC_PMETIS_BIN=460,62099 -export TACC_PMETIS_BIN;461,62147 -TACC_PMETIS_DIR=462,62171 -export TACC_PMETIS_DIR;463,62219 -TACC_PMETIS_DOC=464,62243 -export TACC_PMETIS_DOC;465,62298 -TACC_PMETIS_INC=466,62322 -export TACC_PMETIS_INC;467,62370 -TACC_PMETIS_LIB=468,62394 -export TACC_PMETIS_LIB;469,62442 -_LMFILES_=470,62466 -export _LMFILES_;471,62776 -_ModuleTable_=472,62794 -export _ModuleTable_;473,64660 -export MODULEPATH;479,64890 -_ModuleTable_=480,64909 -export _ModuleTable_;481,66775 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;487,67131 -LD_LIBRARY_PATH=488,67172 -export LD_LIBRARY_PATH;489,67339 -LOADEDMODULES=490,67363 -export LOADEDMODULES;491,67474 -MODULEPATH=492,67496 -export MODULEPATH;493,67577 -TACC_GOTOBLAS_DIR=494,67596 -export TACC_GOTOBLAS_DIR;495,67649 -TACC_GOTOBLAS_LIB=496,67675 -export TACC_GOTOBLAS_LIB;497,67728 -_LMFILES_=498,67754 -export _LMFILES_;499,68124 -_ModuleTable_=500,68142 -export _ModuleTable_;501,70213 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;507,70574 -LD_LIBRARY_PATH=508,70615 -export LD_LIBRARY_PATH;509,70782 -LOADEDMODULES=510,70806 -export LOADEDMODULES;511,70917 -MODULEPATH=512,70939 -export MODULEPATH;513,71020 -TACC_GOTOBLAS_DIR=514,71039 -export TACC_GOTOBLAS_DIR;515,71092 -TACC_GOTOBLAS_LIB=516,71118 -export TACC_GOTOBLAS_LIB;517,71171 -_LMFILES_=518,71197 -export _LMFILES_;519,71567 -_ModuleTable_=520,71585 -export _ModuleTable_;521,73661 -export MODULEPATH;527,73891 -_ModuleTable_=528,73910 -export _ModuleTable_;529,75986 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;535,76390 -LD_LIBRARY_PATH=536,76431 -export LD_LIBRARY_PATH;537,76645 -LMOD_FAMILY_MPI=538,76669 -export LMOD_FAMILY_MPI;539,76693 -LMOD_FAMILY_MPI_VERSION=540,76717 -export LMOD_FAMILY_MPI_VERSION;541,76748 -LOADEDMODULES=542,76780 -export LOADEDMODULES;543,76928 -__LMOD_REF_COUNT_MANPATH=544,76950 -export __LMOD_REF_COUNT_MANPATH;545,77197 -MANPATH=546,77230 -export MANPATH;547,77440 -__LMOD_REF_COUNT_MODULEPATH=548,77456 -export __LMOD_REF_COUNT_MODULEPATH;549,77612 -MODULEPATH=550,77648 -export MODULEPATH;551,77779 -MPIHOME=552,77798 -export MPIHOME;553,77850 -__LMOD_REF_COUNT_PATH=554,77866 -export __LMOD_REF_COUNT_PATH;555,78173 -PATH=556,78203 -export PATH;557,78461 -TACC_PETSC_VERSION=558,78474 -export TACC_PETSC_VERSION;559,78498 -TACC_PHDF5_VERSION=560,78525 -export TACC_PHDF5_VERSION;561,78551 -TACC_PMETIS_BIN=562,78578 -export TACC_PMETIS_BIN;563,78639 -TACC_PMETIS_DIR=564,78663 -export TACC_PMETIS_DIR;565,78724 -TACC_PMETIS_DOC=566,78748 -export TACC_PMETIS_DOC;567,78816 -TACC_PMETIS_INC=568,78840 -export TACC_PMETIS_INC;569,78901 -TACC_PMETIS_LIB=570,78925 -export TACC_PMETIS_LIB;571,78986 -_LMFILES_=572,79010 -export _LMFILES_;573,79594 -_ModuleTable_=574,79612 -export _ModuleTable_;575,81995 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;581,82401 -LD_LIBRARY_PATH=582,82442 -export LD_LIBRARY_PATH;583,82657 -LMOD_FAMILY_MPI=584,82681 -export LMOD_FAMILY_MPI;585,82706 -LMOD_FAMILY_MPI_VERSION=586,82730 -export LMOD_FAMILY_MPI_VERSION;587,82761 -LOADEDMODULES=588,82793 -export LOADEDMODULES;589,82941 -__LMOD_REF_COUNT_MANPATH=590,82963 -export __LMOD_REF_COUNT_MANPATH;591,83211 -MANPATH=592,83244 -export MANPATH;593,83455 -__LMOD_REF_COUNT_MODULEPATH=594,83471 -export __LMOD_REF_COUNT_MODULEPATH;595,83628 -MODULEPATH=596,83664 -export MODULEPATH;597,83796 -MPIHOME=598,83815 -export MPIHOME;599,83868 -__LMOD_REF_COUNT_PATH=600,83884 -export __LMOD_REF_COUNT_PATH;601,84192 -PATH=602,84222 -export PATH;603,84481 -TACC_PETSC_VERSION=604,84494 -export TACC_PETSC_VERSION;605,84518 -TACC_PHDF5_DIR=606,84545 -export TACC_PHDF5_DIR;607,84581 -unset TACC_PHDF5_VERSION;608,84604 -TACC_PMETIS_BIN=609,84630 -export TACC_PMETIS_BIN;610,84689 -TACC_PMETIS_DIR=611,84713 -export TACC_PMETIS_DIR;612,84772 -TACC_PMETIS_DOC=613,84796 -export TACC_PMETIS_DOC;614,84862 -TACC_PMETIS_INC=615,84886 -export TACC_PMETIS_INC;616,84945 -TACC_PMETIS_LIB=617,84969 -export TACC_PMETIS_LIB;618,85028 -_LMFILES_=619,85052 -export _LMFILES_;620,85639 -_ModuleTable_=621,85657 -export _ModuleTable_;622,88037 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;628,88273 -LD_LIBRARY_PATH=629,88314 -export LD_LIBRARY_PATH;630,88378 -LMOD_FAMILY_COMPILER=631,88402 -export LMOD_FAMILY_COMPILER;632,88428 -LMOD_FAMILY_COMPILER_VERSION=633,88457 -export LMOD_FAMILY_COMPILER_VERSION;634,88493 -LMOD_FAMILY_MPI=635,88530 -export LMOD_FAMILY_MPI;636,88555 -LMOD_FAMILY_MPI_VERSION=637,88579 -export LMOD_FAMILY_MPI_VERSION;638,88610 -LOADEDMODULES=639,88642 -export LOADEDMODULES;640,88751 -__LMOD_REF_COUNT_MANPATH=641,88773 -export __LMOD_REF_COUNT_MANPATH;642,88896 -MANPATH=643,88929 -export MANPATH;644,89027 -unset MKL_DIR;645,89043 -unset MKL_INCLUDE;646,89058 -__LMOD_REF_COUNT_MODULEPATH=647,89077 -export __LMOD_REF_COUNT_MODULEPATH;648,89232 -MODULEPATH=649,89268 -export MODULEPATH;650,89398 -MPIHOME=651,89417 -export MPIHOME;652,89469 -__LMOD_REF_COUNT_PATH=653,89485 -export __LMOD_REF_COUNT_PATH;654,89700 -PATH=655,89730 -export PATH;656,89905 -unset TACC_GOTOBLAS_DIR;657,89918 -unset TACC_GOTOBLAS_LIB;658,89943 -unset TACC_PETSC_VERSION;659,89968 -unset TACC_PHDF5_DIR;660,89994 -TACC_PMETIS_BIN=661,90016 -export TACC_PMETIS_BIN;662,90074 -TACC_PMETIS_DIR=663,90098 -export TACC_PMETIS_DIR;664,90156 -TACC_PMETIS_DOC=665,90180 -export TACC_PMETIS_DOC;666,90245 -TACC_PMETIS_INC=667,90269 -export TACC_PMETIS_INC;668,90327 -TACC_PMETIS_LIB=669,90351 -export TACC_PMETIS_LIB;670,90409 -_LMFILES_=671,90433 -export _LMFILES_;672,90823 -_ModuleTable_=673,90841 -export _ModuleTable_;674,93238 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;680,93648 -LD_LIBRARY_PATH=681,93689 -export LD_LIBRARY_PATH;682,93903 -LMOD_FAMILY_COMPILER=683,93927 -export LMOD_FAMILY_COMPILER;684,93955 -LMOD_FAMILY_COMPILER_VERSION=685,93984 -export LMOD_FAMILY_COMPILER_VERSION;686,94020 -LMOD_FAMILY_MPI=687,94057 -export LMOD_FAMILY_MPI;688,94081 -LMOD_FAMILY_MPI_VERSION=689,94105 -export LMOD_FAMILY_MPI_VERSION;690,94136 -LOADEDMODULES=691,94168 -export LOADEDMODULES;692,94316 -__LMOD_REF_COUNT_MANPATH=693,94338 -export __LMOD_REF_COUNT_MANPATH;694,94585 -MANPATH=695,94618 -export MANPATH;696,94828 -MKL_DIR=697,94844 -export MKL_DIR;698,94886 -MKL_INCLUDE=699,94902 -export MKL_INCLUDE;700,94948 -__LMOD_REF_COUNT_MODULEPATH=701,94968 -export __LMOD_REF_COUNT_MODULEPATH;702,95124 -MODULEPATH=703,95160 -export MODULEPATH;704,95291 -MPIHOME=705,95310 -export MPIHOME;706,95362 -__LMOD_REF_COUNT_PATH=707,95378 -export __LMOD_REF_COUNT_PATH;708,95685 -PATH=709,95715 -export PATH;710,95973 -TACC_GOTOBLAS_DIR=711,95986 -export TACC_GOTOBLAS_DIR;712,96039 -TACC_GOTOBLAS_LIB=713,96065 -export TACC_GOTOBLAS_LIB;714,96118 -TACC_PETSC_VERSION=715,96144 -export TACC_PETSC_VERSION;716,96168 -TACC_PHDF5_VERSION=717,96195 -export TACC_PHDF5_VERSION;718,96221 -TACC_PMETIS_BIN=719,96248 -export TACC_PMETIS_BIN;720,96309 -TACC_PMETIS_DIR=721,96333 -export TACC_PMETIS_DIR;722,96394 -TACC_PMETIS_DOC=723,96418 -export TACC_PMETIS_DOC;724,96486 -TACC_PMETIS_INC=725,96510 -export TACC_PMETIS_INC;726,96571 -TACC_PMETIS_LIB=727,96595 -export TACC_PMETIS_LIB;728,96656 -_LMFILES_=729,96680 -export _LMFILES_;730,97264 -_ModuleTable_=731,97282 -export _ModuleTable_;732,99665 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;738,99909 -LD_LIBRARY_PATH=739,99950 -export LD_LIBRARY_PATH;740,100014 -LMOD_FAMILY_COMPILER=741,100038 -export LMOD_FAMILY_COMPILER;742,100064 -LMOD_FAMILY_COMPILER_VERSION=743,100093 -export LMOD_FAMILY_COMPILER_VERSION;744,100129 -LMOD_FAMILY_MPI=745,100166 -export LMOD_FAMILY_MPI;746,100191 -LMOD_FAMILY_MPI_VERSION=747,100215 -export LMOD_FAMILY_MPI_VERSION;748,100246 -LOADEDMODULES=749,100278 -export LOADEDMODULES;750,100387 -__LMOD_REF_COUNT_MANPATH=751,100409 -export __LMOD_REF_COUNT_MANPATH;752,100532 -MANPATH=753,100565 -export MANPATH;754,100663 -unset MKL_DIR;755,100679 -unset MKL_INCLUDE;756,100694 -__LMOD_REF_COUNT_MODULEPATH=757,100713 -export __LMOD_REF_COUNT_MODULEPATH;758,100868 -MODULEPATH=759,100904 -export MODULEPATH;760,101034 -MPIHOME=761,101053 -export MPIHOME;762,101105 -__LMOD_REF_COUNT_PATH=763,101121 -export __LMOD_REF_COUNT_PATH;764,101336 -PATH=765,101366 -export PATH;766,101541 -unset TACC_GOTOBLAS_DIR;767,101554 -unset TACC_GOTOBLAS_LIB;768,101579 -unset TACC_PETSC_VERSION;769,101604 -unset TACC_PHDF5_VERSION;770,101630 -TACC_PMETIS_BIN=771,101656 -export TACC_PMETIS_BIN;772,101714 -TACC_PMETIS_DIR=773,101738 -export TACC_PMETIS_DIR;774,101796 -TACC_PMETIS_DOC=775,101820 -export TACC_PMETIS_DOC;776,101885 -TACC_PMETIS_INC=777,101909 -export TACC_PMETIS_INC;778,101967 -TACC_PMETIS_LIB=779,101991 -export TACC_PMETIS_LIB;780,102049 -_LMFILES_=781,102073 -export _LMFILES_;782,102463 -_ModuleTable_=783,102481 -export _ModuleTable_;784,104873 -export LD_LIBRARY_PATH;790,105096 -LMOD_FAMILY_COMPILER=791,105120 -export LMOD_FAMILY_COMPILER;792,105146 -LMOD_FAMILY_COMPILER_VERSION=793,105175 -export LMOD_FAMILY_COMPILER_VERSION;794,105211 -LOADEDMODULES=795,105248 -export LOADEDMODULES;796,105357 -MANPATH=797,105379 -export MANPATH;798,105477 -unset MKL_DIR;799,105493 -unset MKL_INCLUDE;800,105508 -__LMOD_REF_COUNT_MODULEPATH=801,105527 -export __LMOD_REF_COUNT_MODULEPATH;802,105682 -MODULEPATH=803,105718 -export MODULEPATH;804,105848 -PATH=805,105867 -export PATH;806,106042 -_LMFILES_=807,106055 -export _LMFILES_;808,106445 -_ModuleTable_=809,106463 -export _ModuleTable_;810,108857 -unset __LMOD_REF_COUNT_INFOPATH;816,109034 -unset INFOPATH;817,109067 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;818,109083 -unset LD_LIBRARY_PATH;819,109123 -unset LMOD_FAMILY_COMPILER;820,109146 -unset LMOD_FAMILY_COMPILER_VERSION;821,109174 -unset LMOD_FAMILY_MPI;822,109210 -unset LMOD_FAMILY_MPI_VERSION;823,109233 -unset LOADEDMODULES;824,109264 -unset __LMOD_REF_COUNT_MANPATH;825,109285 -unset MANPATH;826,109317 -__LMOD_REF_COUNT_MODULEPATH=827,109332 -export __LMOD_REF_COUNT_MODULEPATH;828,109390 -MODULEPATH=829,109426 -export MODULEPATH;830,109465 -unset MPIHOME;831,109484 -__LMOD_REF_COUNT_PATH=832,109499 -export __LMOD_REF_COUNT_PATH;833,109559 -PATH=834,109589 -export PATH;835,109627 -unset TACC_PMETIS_BIN;836,109640 -unset TACC_PMETIS_DIR;837,109663 -unset TACC_PMETIS_DOC;838,109686 -unset TACC_PMETIS_INC;839,109709 -unset TACC_PMETIS_LIB;840,109732 -unset _LMFILES_;841,109755 -_ModuleTable_=842,109772 -export _ModuleTable_;843,109928 -export LMOD_FAMILY_COMPILER;849,110107 -LMOD_FAMILY_COMPILER_VERSION=850,110136 -export LMOD_FAMILY_COMPILER_VERSION;851,110172 -LOADEDMODULES=852,110209 -export LOADEDMODULES;853,110234 -__LMOD_REF_COUNT_MODULEPATH=854,110256 -export __LMOD_REF_COUNT_MODULEPATH;855,110358 -MODULEPATH=856,110394 -export MODULEPATH;857,110474 -_LMFILES_=858,110493 -export _LMFILES_;859,110545 -_ModuleTable_=860,110563 -export _ModuleTable_;861,110959 -LMOD_FAMILY_COMPILER=867,111141 -export LMOD_FAMILY_COMPILER;868,111167 -LMOD_FAMILY_COMPILER_VERSION=869,111196 -export LMOD_FAMILY_COMPILER_VERSION;870,111232 -unset MANPATH;871,111269 -unset MKL_DIR;872,111284 -unset MKL_INCLUDE;873,111299 -MODULEPATH=874,111318 -export MODULEPATH;875,111398 -PATH=876,111417 -export PATH;877,111455 -_ModuleTable_=878,111468 -export _ModuleTable_;879,111864 -export LMOD_FAMILY_COMPILER;885,112043 -LMOD_FAMILY_COMPILER_VERSION=886,112072 -export LMOD_FAMILY_COMPILER_VERSION;887,112108 -MODULEPATH=888,112145 -export MODULEPATH;889,112225 -_ModuleTable_=890,112244 -export _ModuleTable_;891,112640 +export _ModuleTable_;60,5746 +export MODULEPATH;66,6027 +_ModuleTable_=67,6046 +export _ModuleTable_;68,7983 +unset LD_LIBRARY_PATH;74,8179 +unset LMOD_FAMILY_COMPILER;75,8202 +unset LMOD_FAMILY_COMPILER_VERSION;76,8230 +unset LMOD_FAMILY_MPI;77,8266 +unset LMOD_FAMILY_MPI_VERSION;78,8289 +LOADEDMODULES=79,8320 +export LOADEDMODULES;80,8405 +__LMOD_REF_COUNT_MANPATH=81,8427 +export __LMOD_REF_COUNT_MANPATH;82,8500 +MANPATH=83,8533 +export MANPATH;84,8584 +unset MKL_DIR;85,8600 +unset MKL_INCLUDE;86,8615 +__LMOD_REF_COUNT_MODULEPATH=87,8634 +export __LMOD_REF_COUNT_MODULEPATH;88,8692 +MODULEPATH=89,8728 +export MODULEPATH;90,8767 +unset MPIHOME;91,8786 +__LMOD_REF_COUNT_PATH=92,8801 +export __LMOD_REF_COUNT_PATH;93,8966 +PATH=94,8996 +export PATH;95,9124 +TACC_PMETIS_BIN=96,9137 +export TACC_PMETIS_BIN;97,9185 +TACC_PMETIS_DIR=98,9209 +export TACC_PMETIS_DIR;99,9257 +TACC_PMETIS_DOC=100,9281 +export TACC_PMETIS_DOC;101,9336 +TACC_PMETIS_INC=102,9360 +export TACC_PMETIS_INC;103,9408 +TACC_PMETIS_LIB=104,9432 +export TACC_PMETIS_LIB;105,9480 +_LMFILES_=106,9504 +export _LMFILES_;107,9771 +_ModuleTable_=108,9789 +export _ModuleTable_;109,11225 +export MODULEPATH;115,11412 +_ModuleTable_=116,11431 +export _ModuleTable_;117,12867 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;123,13102 +LD_LIBRARY_PATH=124,13143 +export LD_LIBRARY_PATH;125,13207 +LMOD_FAMILY_COMPILER=126,13231 +export LMOD_FAMILY_COMPILER;127,13257 +LMOD_FAMILY_COMPILER_VERSION=128,13286 +export LMOD_FAMILY_COMPILER_VERSION;129,13322 +LMOD_FAMILY_MPI=130,13359 +export LMOD_FAMILY_MPI;131,13384 +LMOD_FAMILY_MPI_VERSION=132,13408 +export LMOD_FAMILY_MPI_VERSION;133,13439 +LOADEDMODULES=134,13471 +export LOADEDMODULES;135,13580 +__LMOD_REF_COUNT_MANPATH=136,13602 +export __LMOD_REF_COUNT_MANPATH;137,13725 +MANPATH=138,13758 +export MANPATH;139,13856 +__LMOD_REF_COUNT_MODULEPATH=140,13872 +export __LMOD_REF_COUNT_MODULEPATH;141,14027 +MODULEPATH=142,14063 +export MODULEPATH;143,14193 +MPIHOME=144,14212 +export MPIHOME;145,14264 +__LMOD_REF_COUNT_PATH=146,14280 +export __LMOD_REF_COUNT_PATH;147,14495 +PATH=148,14525 +export PATH;149,14700 +TACC_PMETIS_BIN=150,14713 +export TACC_PMETIS_BIN;151,14771 +TACC_PMETIS_DIR=152,14795 +export TACC_PMETIS_DIR;153,14853 +TACC_PMETIS_DOC=154,14877 +export TACC_PMETIS_DOC;155,14942 +TACC_PMETIS_INC=156,14966 +export TACC_PMETIS_INC;157,15024 +TACC_PMETIS_LIB=158,15048 +export TACC_PMETIS_LIB;159,15106 +_LMFILES_=160,15130 +export _LMFILES_;161,15520 +_ModuleTable_=162,15538 +export _ModuleTable_;163,17482 +export MODULEPATH;169,17760 +_ModuleTable_=170,17779 +export _ModuleTable_;171,19723 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;177,20093 +LD_LIBRARY_PATH=178,20134 +export LD_LIBRARY_PATH;179,20315 +LMOD_FAMILY_COMPILER=180,20339 +export LMOD_FAMILY_COMPILER;181,20367 +LMOD_FAMILY_COMPILER_VERSION=182,20396 +export LMOD_FAMILY_COMPILER_VERSION;183,20432 +LMOD_FAMILY_MPI=184,20469 +export LMOD_FAMILY_MPI;185,20494 +LMOD_FAMILY_MPI_VERSION=186,20518 +export LMOD_FAMILY_MPI_VERSION;187,20549 +LOADEDMODULES=188,20581 +export LOADEDMODULES;189,20692 +__LMOD_REF_COUNT_MANPATH=190,20714 +export __LMOD_REF_COUNT_MANPATH;191,20962 +MANPATH=192,20995 +export MANPATH;193,21206 +MKL_DIR=194,21222 +export MKL_DIR;195,21264 +MKL_INCLUDE=196,21280 +export MKL_INCLUDE;197,21326 +__LMOD_REF_COUNT_MODULEPATH=198,21346 +export __LMOD_REF_COUNT_MODULEPATH;199,21503 +MODULEPATH=200,21539 +export MODULEPATH;201,21671 +MPIHOME=202,21690 +export MPIHOME;203,21743 +__LMOD_REF_COUNT_PATH=204,21759 +export __LMOD_REF_COUNT_PATH;205,22067 +PATH=206,22097 +export PATH;207,22356 +TACC_PMETIS_BIN=208,22369 +export TACC_PMETIS_BIN;209,22428 +TACC_PMETIS_DIR=210,22452 +export TACC_PMETIS_DIR;211,22511 +TACC_PMETIS_DOC=212,22535 +export TACC_PMETIS_DOC;213,22601 +TACC_PMETIS_INC=214,22625 +export TACC_PMETIS_INC;215,22684 +TACC_PMETIS_LIB=216,22708 +export TACC_PMETIS_LIB;217,22767 +_LMFILES_=218,22791 +export _LMFILES_;219,23185 +_ModuleTable_=220,23203 +export _ModuleTable_;221,25140 +export LOADEDMODULES;227,25439 +MODULEPATH=228,25461 +export MODULEPATH;229,25593 +TACC_PETSC_VERSION=230,25612 +export TACC_PETSC_VERSION;231,25636 +TACC_PHDF5_DIR=232,25663 +export TACC_PHDF5_DIR;233,25699 +_LMFILES_=234,25722 +export _LMFILES_;235,26248 +_ModuleTable_=236,26266 +export _ModuleTable_;237,28624 +export MODULEPATH;243,28905 +_ModuleTable_=244,28924 +export _ModuleTable_;245,31282 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;251,31657 +LD_LIBRARY_PATH=252,31698 +export LD_LIBRARY_PATH;253,31878 +LMOD_FAMILY_MPI=254,31902 +export LMOD_FAMILY_MPI;255,31926 +LMOD_FAMILY_MPI_VERSION=256,31950 +export LMOD_FAMILY_MPI_VERSION;257,31981 +LOADEDMODULES=258,32013 +export LOADEDMODULES;259,32147 +__LMOD_REF_COUNT_MANPATH=260,32169 +export __LMOD_REF_COUNT_MANPATH;261,32416 +MANPATH=262,32449 +export MANPATH;263,32659 +__LMOD_REF_COUNT_MODULEPATH=264,32675 +export __LMOD_REF_COUNT_MODULEPATH;265,32831 +MODULEPATH=266,32867 +export MODULEPATH;267,32998 +MPIHOME=268,33017 +export MPIHOME;269,33069 +__LMOD_REF_COUNT_PATH=270,33085 +export __LMOD_REF_COUNT_PATH;271,33392 +PATH=272,33422 +export PATH;273,33680 +TACC_PETSC_VERSION=274,33693 +export TACC_PETSC_VERSION;275,33717 +unset TACC_PHDF5_DIR;276,33744 +TACC_PHDF5_VERSION=277,33766 +export TACC_PHDF5_VERSION;278,33792 +TACC_PMETIS_BIN=279,33819 +export TACC_PMETIS_BIN;280,33880 +TACC_PMETIS_DIR=281,33904 +export TACC_PMETIS_DIR;282,33965 +TACC_PMETIS_DOC=283,33989 +export TACC_PMETIS_DOC;284,34057 +TACC_PMETIS_INC=285,34081 +export TACC_PMETIS_INC;286,34142 +TACC_PMETIS_LIB=287,34166 +export TACC_PMETIS_LIB;288,34227 +_LMFILES_=289,34251 +export _LMFILES_;290,34775 +_ModuleTable_=291,34793 +export _ModuleTable_;292,37155 +export MODULEPATH;298,37435 +_ModuleTable_=299,37454 +export _ModuleTable_;300,39816 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;306,40192 +LD_LIBRARY_PATH=307,40233 +export LD_LIBRARY_PATH;308,40414 +LMOD_FAMILY_MPI=309,40438 +export LMOD_FAMILY_MPI;310,40463 +LMOD_FAMILY_MPI_VERSION=311,40487 +export LMOD_FAMILY_MPI_VERSION;312,40518 +LOADEDMODULES=313,40550 +export LOADEDMODULES;314,40683 +__LMOD_REF_COUNT_MANPATH=315,40705 +export __LMOD_REF_COUNT_MANPATH;316,40953 +MANPATH=317,40986 +export MANPATH;318,41197 +__LMOD_REF_COUNT_MODULEPATH=319,41213 +export __LMOD_REF_COUNT_MODULEPATH;320,41370 +MODULEPATH=321,41406 +export MODULEPATH;322,41538 +MPIHOME=323,41557 +export MPIHOME;324,41610 +__LMOD_REF_COUNT_PATH=325,41626 +export __LMOD_REF_COUNT_PATH;326,41934 +PATH=327,41964 +export PATH;328,42223 +TACC_PETSC_VERSION=329,42236 +export TACC_PETSC_VERSION;330,42260 +TACC_PHDF5_DIR=331,42287 +export TACC_PHDF5_DIR;332,42323 +unset TACC_PHDF5_VERSION;333,42346 +TACC_PMETIS_BIN=334,42372 +export TACC_PMETIS_BIN;335,42431 +TACC_PMETIS_DIR=336,42455 +export TACC_PMETIS_DIR;337,42514 +TACC_PMETIS_DOC=338,42538 +export TACC_PMETIS_DOC;339,42604 +TACC_PMETIS_INC=340,42628 +export TACC_PMETIS_INC;341,42687 +TACC_PMETIS_LIB=342,42711 +export TACC_PMETIS_LIB;343,42770 +_LMFILES_=344,42794 +export _LMFILES_;345,43320 +_ModuleTable_=346,43338 +export _ModuleTable_;347,45696 +export MODULEPATH;353,45977 +_ModuleTable_=354,45996 +export _ModuleTable_;355,48354 +export LOADEDMODULES;361,48643 +MODULEPATH=362,48665 +export MODULEPATH;363,48797 +TACC_PHDF5_DIR=364,48816 +export TACC_PHDF5_DIR;365,48852 +_LMFILES_=366,48875 +export _LMFILES_;367,49402 +_ModuleTable_=368,49420 +export _ModuleTable_;369,51774 +export MODULEPATH;375,52055 +_ModuleTable_=376,52074 +export _ModuleTable_;377,54428 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;383,54803 +LD_LIBRARY_PATH=384,54844 +export LD_LIBRARY_PATH;385,55024 +LMOD_FAMILY_MPI=386,55048 +export LMOD_FAMILY_MPI;387,55072 +LMOD_FAMILY_MPI_VERSION=388,55096 +export LMOD_FAMILY_MPI_VERSION;389,55127 +LOADEDMODULES=390,55159 +export LOADEDMODULES;391,55293 +__LMOD_REF_COUNT_MANPATH=392,55315 +export __LMOD_REF_COUNT_MANPATH;393,55562 +MANPATH=394,55595 +export MANPATH;395,55805 +__LMOD_REF_COUNT_MODULEPATH=396,55821 +export __LMOD_REF_COUNT_MODULEPATH;397,55977 +MODULEPATH=398,56013 +export MODULEPATH;399,56144 +MPIHOME=400,56163 +export MPIHOME;401,56215 +__LMOD_REF_COUNT_PATH=402,56231 +export __LMOD_REF_COUNT_PATH;403,56538 +PATH=404,56568 +export PATH;405,56826 +TACC_PETSC_VERSION=406,56839 +export TACC_PETSC_VERSION;407,56863 +unset TACC_PHDF5_DIR;408,56890 +TACC_PHDF5_VERSION=409,56912 +export TACC_PHDF5_VERSION;410,56938 +TACC_PMETIS_BIN=411,56965 +export TACC_PMETIS_BIN;412,57026 +TACC_PMETIS_DIR=413,57050 +export TACC_PMETIS_DIR;414,57111 +TACC_PMETIS_DOC=415,57135 +export TACC_PMETIS_DOC;416,57203 +TACC_PMETIS_INC=417,57227 +export TACC_PMETIS_INC;418,57288 +TACC_PMETIS_LIB=419,57312 +export TACC_PMETIS_LIB;420,57373 +_LMFILES_=421,57397 +export _LMFILES_;422,57921 +_ModuleTable_=423,57939 +export _ModuleTable_;424,60295 +export MODULEPATH;430,60575 +_ModuleTable_=431,60594 +export _ModuleTable_;432,62950 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;438,63269 +LD_LIBRARY_PATH=439,63310 +export LD_LIBRARY_PATH;440,63443 +unset LMOD_FAMILY_MPI;441,63467 +unset LMOD_FAMILY_MPI_VERSION;442,63490 +LOADEDMODULES=443,63521 +export LOADEDMODULES;444,63618 +__LMOD_REF_COUNT_MANPATH=445,63640 +export __LMOD_REF_COUNT_MANPATH;446,63837 +MANPATH=447,63870 +export MANPATH;448,64033 +__LMOD_REF_COUNT_MODULEPATH=449,64049 +export __LMOD_REF_COUNT_MODULEPATH;450,64152 +MODULEPATH=451,64188 +export MODULEPATH;452,64269 +unset MPIHOME;453,64288 +__LMOD_REF_COUNT_PATH=454,64303 +export __LMOD_REF_COUNT_PATH;455,64560 +PATH=456,64590 +export PATH;457,64801 +unset TACC_PETSC_VERSION;458,64814 +unset TACC_PHDF5_VERSION;459,64840 +TACC_PMETIS_BIN=460,64866 +export TACC_PMETIS_BIN;461,64914 +TACC_PMETIS_DIR=462,64938 +export TACC_PMETIS_DIR;463,64986 +TACC_PMETIS_DOC=464,65010 +export TACC_PMETIS_DOC;465,65065 +TACC_PMETIS_INC=466,65089 +export TACC_PMETIS_INC;467,65137 +TACC_PMETIS_LIB=468,65161 +export TACC_PMETIS_LIB;469,65209 +_LMFILES_=470,65233 +export _LMFILES_;471,65543 +_ModuleTable_=472,65561 +export _ModuleTable_;473,67515 +export MODULEPATH;479,67745 +_ModuleTable_=480,67764 +export _ModuleTable_;481,69718 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;487,70074 +LD_LIBRARY_PATH=488,70115 +export LD_LIBRARY_PATH;489,70282 +LOADEDMODULES=490,70306 +export LOADEDMODULES;491,70417 +MODULEPATH=492,70439 +export MODULEPATH;493,70520 +TACC_GOTOBLAS_DIR=494,70539 +export TACC_GOTOBLAS_DIR;495,70592 +TACC_GOTOBLAS_LIB=496,70618 +export TACC_GOTOBLAS_LIB;497,70671 +_LMFILES_=498,70697 +export _LMFILES_;499,71067 +_ModuleTable_=500,71085 +export _ModuleTable_;501,73244 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;507,73605 +LD_LIBRARY_PATH=508,73646 +export LD_LIBRARY_PATH;509,73813 +LOADEDMODULES=510,73837 +export LOADEDMODULES;511,73948 +MODULEPATH=512,73970 +export MODULEPATH;513,74051 +TACC_GOTOBLAS_DIR=514,74070 +export TACC_GOTOBLAS_DIR;515,74123 +TACC_GOTOBLAS_LIB=516,74149 +export TACC_GOTOBLAS_LIB;517,74202 +_LMFILES_=518,74228 +export _LMFILES_;519,74598 +_ModuleTable_=520,74616 +export _ModuleTable_;521,76780 +export MODULEPATH;527,77010 +_ModuleTable_=528,77029 +export _ModuleTable_;529,79193 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;535,79597 +LD_LIBRARY_PATH=536,79638 +export LD_LIBRARY_PATH;537,79852 +LMOD_FAMILY_MPI=538,79876 +export LMOD_FAMILY_MPI;539,79900 +LMOD_FAMILY_MPI_VERSION=540,79924 +export LMOD_FAMILY_MPI_VERSION;541,79955 +LOADEDMODULES=542,79987 +export LOADEDMODULES;543,80135 +__LMOD_REF_COUNT_MANPATH=544,80157 +export __LMOD_REF_COUNT_MANPATH;545,80404 +MANPATH=546,80437 +export MANPATH;547,80647 +__LMOD_REF_COUNT_MODULEPATH=548,80663 +export __LMOD_REF_COUNT_MODULEPATH;549,80819 +MODULEPATH=550,80855 +export MODULEPATH;551,80986 +MPIHOME=552,81005 +export MPIHOME;553,81057 +__LMOD_REF_COUNT_PATH=554,81073 +export __LMOD_REF_COUNT_PATH;555,81380 +PATH=556,81410 +export PATH;557,81668 +TACC_PETSC_VERSION=558,81681 +export TACC_PETSC_VERSION;559,81705 +TACC_PHDF5_VERSION=560,81732 +export TACC_PHDF5_VERSION;561,81758 +TACC_PMETIS_BIN=562,81785 +export TACC_PMETIS_BIN;563,81846 +TACC_PMETIS_DIR=564,81870 +export TACC_PMETIS_DIR;565,81931 +TACC_PMETIS_DOC=566,81955 +export TACC_PMETIS_DOC;567,82023 +TACC_PMETIS_INC=568,82047 +export TACC_PMETIS_INC;569,82108 +TACC_PMETIS_LIB=570,82132 +export TACC_PMETIS_LIB;571,82193 +_LMFILES_=572,82217 +export _LMFILES_;573,82801 +_ModuleTable_=574,82819 +export _ModuleTable_;575,85386 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;581,85792 +LD_LIBRARY_PATH=582,85833 +export LD_LIBRARY_PATH;583,86048 +LMOD_FAMILY_MPI=584,86072 +export LMOD_FAMILY_MPI;585,86097 +LMOD_FAMILY_MPI_VERSION=586,86121 +export LMOD_FAMILY_MPI_VERSION;587,86152 +LOADEDMODULES=588,86184 +export LOADEDMODULES;589,86332 +__LMOD_REF_COUNT_MANPATH=590,86354 +export __LMOD_REF_COUNT_MANPATH;591,86602 +MANPATH=592,86635 +export MANPATH;593,86846 +__LMOD_REF_COUNT_MODULEPATH=594,86862 +export __LMOD_REF_COUNT_MODULEPATH;595,87019 +MODULEPATH=596,87055 +export MODULEPATH;597,87187 +MPIHOME=598,87206 +export MPIHOME;599,87259 +__LMOD_REF_COUNT_PATH=600,87275 +export __LMOD_REF_COUNT_PATH;601,87583 +PATH=602,87613 +export PATH;603,87872 +TACC_PETSC_VERSION=604,87885 +export TACC_PETSC_VERSION;605,87909 +TACC_PHDF5_DIR=606,87936 +export TACC_PHDF5_DIR;607,87972 +unset TACC_PHDF5_VERSION;608,87995 +TACC_PMETIS_BIN=609,88021 +export TACC_PMETIS_BIN;610,88080 +TACC_PMETIS_DIR=611,88104 +export TACC_PMETIS_DIR;612,88163 +TACC_PMETIS_DOC=613,88187 +export TACC_PMETIS_DOC;614,88253 +TACC_PMETIS_INC=615,88277 +export TACC_PMETIS_INC;616,88336 +TACC_PMETIS_LIB=617,88360 +export TACC_PMETIS_LIB;618,88419 +_LMFILES_=619,88443 +export _LMFILES_;620,89030 +_ModuleTable_=621,89048 +export _ModuleTable_;622,91613 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;628,91849 +LD_LIBRARY_PATH=629,91890 +export LD_LIBRARY_PATH;630,91954 +LMOD_FAMILY_COMPILER=631,91978 +export LMOD_FAMILY_COMPILER;632,92004 +LMOD_FAMILY_COMPILER_VERSION=633,92033 +export LMOD_FAMILY_COMPILER_VERSION;634,92069 +LMOD_FAMILY_MPI=635,92106 +export LMOD_FAMILY_MPI;636,92131 +LMOD_FAMILY_MPI_VERSION=637,92155 +export LMOD_FAMILY_MPI_VERSION;638,92186 +LOADEDMODULES=639,92218 +export LOADEDMODULES;640,92327 +__LMOD_REF_COUNT_MANPATH=641,92349 +export __LMOD_REF_COUNT_MANPATH;642,92472 +MANPATH=643,92505 +export MANPATH;644,92603 +unset MKL_DIR;645,92619 +unset MKL_INCLUDE;646,92634 +__LMOD_REF_COUNT_MODULEPATH=647,92653 +export __LMOD_REF_COUNT_MODULEPATH;648,92808 +MODULEPATH=649,92844 +export MODULEPATH;650,92974 +MPIHOME=651,92993 +export MPIHOME;652,93045 +__LMOD_REF_COUNT_PATH=653,93061 +export __LMOD_REF_COUNT_PATH;654,93276 +PATH=655,93306 +export PATH;656,93481 +unset TACC_GOTOBLAS_DIR;657,93494 +unset TACC_GOTOBLAS_LIB;658,93519 +unset TACC_PETSC_VERSION;659,93544 +unset TACC_PHDF5_DIR;660,93570 +TACC_PMETIS_BIN=661,93592 +export TACC_PMETIS_BIN;662,93650 +TACC_PMETIS_DIR=663,93674 +export TACC_PMETIS_DIR;664,93732 +TACC_PMETIS_DOC=665,93756 +export TACC_PMETIS_DOC;666,93821 +TACC_PMETIS_INC=667,93845 +export TACC_PMETIS_INC;668,93903 +TACC_PMETIS_LIB=669,93927 +export TACC_PMETIS_LIB;670,93985 +_LMFILES_=671,94009 +export _LMFILES_;672,94399 +_ModuleTable_=673,94417 +export _ModuleTable_;674,96997 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;680,97407 +LD_LIBRARY_PATH=681,97448 +export LD_LIBRARY_PATH;682,97662 +LMOD_FAMILY_COMPILER=683,97686 +export LMOD_FAMILY_COMPILER;684,97714 +LMOD_FAMILY_COMPILER_VERSION=685,97743 +export LMOD_FAMILY_COMPILER_VERSION;686,97779 +LMOD_FAMILY_MPI=687,97816 +export LMOD_FAMILY_MPI;688,97840 +LMOD_FAMILY_MPI_VERSION=689,97864 +export LMOD_FAMILY_MPI_VERSION;690,97895 +LOADEDMODULES=691,97927 +export LOADEDMODULES;692,98075 +__LMOD_REF_COUNT_MANPATH=693,98097 +export __LMOD_REF_COUNT_MANPATH;694,98344 +MANPATH=695,98377 +export MANPATH;696,98587 +MKL_DIR=697,98603 +export MKL_DIR;698,98645 +MKL_INCLUDE=699,98661 +export MKL_INCLUDE;700,98707 +__LMOD_REF_COUNT_MODULEPATH=701,98727 +export __LMOD_REF_COUNT_MODULEPATH;702,98883 +MODULEPATH=703,98919 +export MODULEPATH;704,99050 +MPIHOME=705,99069 +export MPIHOME;706,99121 +__LMOD_REF_COUNT_PATH=707,99137 +export __LMOD_REF_COUNT_PATH;708,99444 +PATH=709,99474 +export PATH;710,99732 +TACC_GOTOBLAS_DIR=711,99745 +export TACC_GOTOBLAS_DIR;712,99798 +TACC_GOTOBLAS_LIB=713,99824 +export TACC_GOTOBLAS_LIB;714,99877 +TACC_PETSC_VERSION=715,99903 +export TACC_PETSC_VERSION;716,99927 +TACC_PHDF5_VERSION=717,99954 +export TACC_PHDF5_VERSION;718,99980 +TACC_PMETIS_BIN=719,100007 +export TACC_PMETIS_BIN;720,100068 +TACC_PMETIS_DIR=721,100092 +export TACC_PMETIS_DIR;722,100153 +TACC_PMETIS_DOC=723,100177 +export TACC_PMETIS_DOC;724,100245 +TACC_PMETIS_INC=725,100269 +export TACC_PMETIS_INC;726,100330 +TACC_PMETIS_LIB=727,100354 +export TACC_PMETIS_LIB;728,100415 +_LMFILES_=729,100439 +export _LMFILES_;730,101023 +_ModuleTable_=731,101041 +export _ModuleTable_;732,103608 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;738,103852 +LD_LIBRARY_PATH=739,103893 +export LD_LIBRARY_PATH;740,103957 +LMOD_FAMILY_COMPILER=741,103981 +export LMOD_FAMILY_COMPILER;742,104007 +LMOD_FAMILY_COMPILER_VERSION=743,104036 +export LMOD_FAMILY_COMPILER_VERSION;744,104072 +LMOD_FAMILY_MPI=745,104109 +export LMOD_FAMILY_MPI;746,104134 +LMOD_FAMILY_MPI_VERSION=747,104158 +export LMOD_FAMILY_MPI_VERSION;748,104189 +LOADEDMODULES=749,104221 +export LOADEDMODULES;750,104330 +__LMOD_REF_COUNT_MANPATH=751,104352 +export __LMOD_REF_COUNT_MANPATH;752,104475 +MANPATH=753,104508 +export MANPATH;754,104606 +unset MKL_DIR;755,104622 +unset MKL_INCLUDE;756,104637 +__LMOD_REF_COUNT_MODULEPATH=757,104656 +export __LMOD_REF_COUNT_MODULEPATH;758,104811 +MODULEPATH=759,104847 +export MODULEPATH;760,104977 +MPIHOME=761,104996 +export MPIHOME;762,105048 +__LMOD_REF_COUNT_PATH=763,105064 +export __LMOD_REF_COUNT_PATH;764,105279 +PATH=765,105309 +export PATH;766,105484 +unset TACC_GOTOBLAS_DIR;767,105497 +unset TACC_GOTOBLAS_LIB;768,105522 +unset TACC_PETSC_VERSION;769,105547 +unset TACC_PHDF5_VERSION;770,105573 +TACC_PMETIS_BIN=771,105599 +export TACC_PMETIS_BIN;772,105657 +TACC_PMETIS_DIR=773,105681 +export TACC_PMETIS_DIR;774,105739 +TACC_PMETIS_DOC=775,105763 +export TACC_PMETIS_DOC;776,105828 +TACC_PMETIS_INC=777,105852 +export TACC_PMETIS_INC;778,105910 +TACC_PMETIS_LIB=779,105934 +export TACC_PMETIS_LIB;780,105992 +_LMFILES_=781,106016 +export _LMFILES_;782,106406 +_ModuleTable_=783,106424 +export _ModuleTable_;784,108999 +export LD_LIBRARY_PATH;790,109222 +LMOD_FAMILY_COMPILER=791,109246 +export LMOD_FAMILY_COMPILER;792,109272 +LMOD_FAMILY_COMPILER_VERSION=793,109301 +export LMOD_FAMILY_COMPILER_VERSION;794,109337 +LOADEDMODULES=795,109374 +export LOADEDMODULES;796,109483 +MANPATH=797,109505 +export MANPATH;798,109603 +unset MKL_DIR;799,109619 +unset MKL_INCLUDE;800,109634 +__LMOD_REF_COUNT_MODULEPATH=801,109653 +export __LMOD_REF_COUNT_MODULEPATH;802,109808 +MODULEPATH=803,109844 +export MODULEPATH;804,109974 +PATH=805,109993 +export PATH;806,110168 +_LMFILES_=807,110181 +export _LMFILES_;808,110571 +_ModuleTable_=809,110589 +export _ModuleTable_;810,113166 +unset __LMOD_REF_COUNT_INFOPATH;816,113343 +unset INFOPATH;817,113376 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;818,113392 +unset LD_LIBRARY_PATH;819,113432 +unset LMOD_FAMILY_COMPILER;820,113455 +unset LMOD_FAMILY_COMPILER_VERSION;821,113483 +unset LMOD_FAMILY_MPI;822,113519 +unset LMOD_FAMILY_MPI_VERSION;823,113542 +unset LOADEDMODULES;824,113573 +unset __LMOD_REF_COUNT_MANPATH;825,113594 +unset MANPATH;826,113626 +__LMOD_REF_COUNT_MODULEPATH=827,113641 +export __LMOD_REF_COUNT_MODULEPATH;828,113699 +MODULEPATH=829,113735 +export MODULEPATH;830,113774 +unset MPIHOME;831,113793 +__LMOD_REF_COUNT_PATH=832,113808 +export __LMOD_REF_COUNT_PATH;833,113868 +PATH=834,113898 +export PATH;835,113936 +unset TACC_PMETIS_BIN;836,113949 +unset TACC_PMETIS_DIR;837,113972 +unset TACC_PMETIS_DOC;838,113995 +unset TACC_PMETIS_INC;839,114018 +unset TACC_PMETIS_LIB;840,114041 +unset _LMFILES_;841,114064 +_ModuleTable_=842,114081 +export _ModuleTable_;843,114237 +export LMOD_FAMILY_COMPILER;849,114416 +LMOD_FAMILY_COMPILER_VERSION=850,114445 +export LMOD_FAMILY_COMPILER_VERSION;851,114481 +LOADEDMODULES=852,114518 +export LOADEDMODULES;853,114543 +__LMOD_REF_COUNT_MODULEPATH=854,114565 +export __LMOD_REF_COUNT_MODULEPATH;855,114667 +MODULEPATH=856,114703 +export MODULEPATH;857,114783 +_LMFILES_=858,114802 +export _LMFILES_;859,114854 +_ModuleTable_=860,114872 +export _ModuleTable_;861,115355 +LMOD_FAMILY_COMPILER=867,115537 +export LMOD_FAMILY_COMPILER;868,115563 +LMOD_FAMILY_COMPILER_VERSION=869,115592 +export LMOD_FAMILY_COMPILER_VERSION;870,115628 +unset MANPATH;871,115665 +unset MKL_DIR;872,115680 +unset MKL_INCLUDE;873,115695 +MODULEPATH=874,115714 +export MODULEPATH;875,115794 +PATH=876,115813 +export PATH;877,115851 +_ModuleTable_=878,115864 +export _ModuleTable_;879,116347 +export LMOD_FAMILY_COMPILER;885,116526 +LMOD_FAMILY_COMPILER_VERSION=886,116555 +export LMOD_FAMILY_COMPILER_VERSION;887,116591 +MODULEPATH=888,116628 +export MODULEPATH;889,116708 +_ModuleTable_=890,116727 +export _ModuleTable_;891,117210 rt/show/show.tdesc,19 testdescript 2,15 @@ -6047,19 +6045,19 @@ export MODULEPATH;18,684 _LMFILES_=19,703 export _LMFILES_;20,763 _ModuleTable_=21,781 -export _ModuleTable_;22,1202 -export MODULEPATH;28,1444 -_ModuleTable_=29,1463 -export _ModuleTable_;30,1884 -export MODULEPATH;36,2131 -_ModuleTable_=37,2150 -export _ModuleTable_;38,2571 -export MODULEPATH;44,2821 -_ModuleTable_=45,2840 -export _ModuleTable_;46,3261 -export MODULEPATH;52,3527 -_ModuleTable_=53,3546 -export _ModuleTable_;54,3967 +export _ModuleTable_;22,1295 +export MODULEPATH;28,1537 +_ModuleTable_=29,1556 +export _ModuleTable_;30,2070 +export MODULEPATH;36,2317 +_ModuleTable_=37,2336 +export _ModuleTable_;38,2850 +export MODULEPATH;44,3100 +_ModuleTable_=45,3119 +export _ModuleTable_;46,3633 +export MODULEPATH;52,3899 +_ModuleTable_=53,3918 +export _ModuleTable_;54,4432 rt/terse_avail/terse_avail.tdesc,19 testdescript 2,15 @@ -6308,215 +6306,215 @@ export USER_SHELL;88,5128 _LMFILES_=89,5147 export _LMFILES_;90,5461 _ModuleTable_=91,5479 -export _ModuleTable_;92,7109 -export MODULEPATH;98,7400 -_ModuleTable_=99,7419 -export _ModuleTable_;100,9049 -export MODULEPATH;106,9331 -_ModuleTable_=107,9350 -export _ModuleTable_;108,10980 -export MODULEPATH;114,11270 -_ModuleTable_=115,11289 -export _ModuleTable_;116,12919 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;122,13377 -LD_LIBRARY_PATH=123,13418 -export LD_LIBRARY_PATH;124,13681 -LMOD_FAMILY_COMPILER=125,13705 -export LMOD_FAMILY_COMPILER;126,13731 -LMOD_FAMILY_COMPILER_VERSION=127,13760 -export LMOD_FAMILY_COMPILER_VERSION;128,13796 -LOADEDMODULES=129,13833 -export LOADEDMODULES;130,13933 -__LMOD_REF_COUNT_MANPATH=131,13955 -export __LMOD_REF_COUNT_MANPATH;132,14326 -MANPATH=133,14359 -export MANPATH;134,14678 -__LMOD_REF_COUNT_MODULEPATH=135,14694 -export __LMOD_REF_COUNT_MODULEPATH;136,14855 -MODULEPATH=137,14891 -export MODULEPATH;138,15027 -__LMOD_REF_COUNT_PATH=139,15046 -export __LMOD_REF_COUNT_PATH;140,15429 -PATH=141,15459 -export PATH;142,15793 -PGI=143,15806 -export PGI;144,15835 -_LMFILES_=145,15847 -export _LMFILES_;146,16163 -_ModuleTable_=147,16181 -export _ModuleTable_;148,17842 -export MODULEPATH;154,18126 -_ModuleTable_=155,18145 -export _ModuleTable_;156,19806 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;162,20255 -LD_LIBRARY_PATH=163,20296 -export LD_LIBRARY_PATH;164,20559 -LMOD_FAMILY_COMPILER=165,20583 -export LMOD_FAMILY_COMPILER;166,20609 -LMOD_FAMILY_COMPILER_VERSION=167,20638 -export LMOD_FAMILY_COMPILER_VERSION;168,20672 -LOADEDMODULES=169,20709 -export LOADEDMODULES;170,20807 -__LMOD_REF_COUNT_MANPATH=171,20829 -export __LMOD_REF_COUNT_MANPATH;172,21200 -MANPATH=173,21233 -export MANPATH;174,21552 -__LMOD_REF_COUNT_MODULEPATH=175,21568 -export __LMOD_REF_COUNT_MODULEPATH;176,21727 -MODULEPATH=177,21763 -export MODULEPATH;178,21897 -__LMOD_REF_COUNT_PATH=179,21916 -export __LMOD_REF_COUNT_PATH;180,22299 -PATH=181,22329 -export PATH;182,22663 -PGI=183,22676 -export PGI;184,22703 -_LMFILES_=185,22715 -export _LMFILES_;186,23029 -_ModuleTable_=187,23047 -export _ModuleTable_;188,24677 -export MODULEPATH;194,24960 -_ModuleTable_=195,24979 -export _ModuleTable_;196,26609 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;202,27072 -LD_LIBRARY_PATH=203,27113 -export LD_LIBRARY_PATH;204,27376 -LMOD_FAMILY_COMPILER=205,27400 -export LMOD_FAMILY_COMPILER;206,27426 -LMOD_FAMILY_COMPILER_VERSION=207,27455 -export LMOD_FAMILY_COMPILER_VERSION;208,27491 -LOADEDMODULES=209,27528 -export LOADEDMODULES;210,27628 -__LMOD_REF_COUNT_MANPATH=211,27650 -export __LMOD_REF_COUNT_MANPATH;212,28021 -MANPATH=213,28054 -export MANPATH;214,28373 -__LMOD_REF_COUNT_MODULEPATH=215,28389 -export __LMOD_REF_COUNT_MODULEPATH;216,28550 -MODULEPATH=217,28586 -export MODULEPATH;218,28722 -__LMOD_REF_COUNT_PATH=219,28741 -export __LMOD_REF_COUNT_PATH;220,29124 -PATH=221,29154 -export PATH;222,29488 -PGI=223,29501 -export PGI;224,29530 -_LMFILES_=225,29542 -export _LMFILES_;226,29858 -_ModuleTable_=227,29876 -export _ModuleTable_;228,31537 -export MODULEPATH;234,31822 -_ModuleTable_=235,31841 -export _ModuleTable_;236,33502 -unset GLOBUS_HOSTNAME;242,33673 -unset GLOBUS_LOCATION;243,33696 -unset GLOBUS_PATH;244,33719 -unset GLOBUS_TCP_PORT_RANGE;245,33738 -unset GPT_LOCATION;246,33767 -unset __LMOD_REF_COUNT_INFOPATH;247,33787 -unset INFOPATH;248,33820 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=249,33836 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;250,33888 -LD_LIBRARY_PATH=251,33929 -export LD_LIBRARY_PATH;252,33962 -unset __LMOD_REF_COUNT_LIBPATH;253,33986 -unset LIBPATH;254,34018 -unset LMOD_FAMILY_COMPILER;255,34033 -unset LMOD_FAMILY_COMPILER_VERSION;256,34061 -unset LMOD_FAMILY_MPI;257,34097 -unset LMOD_FAMILY_MPI_VERSION;258,34120 -LOADEDMODULES=259,34151 -export LOADEDMODULES;260,34188 -__LMOD_REF_COUNT_MANPATH=261,34210 -export __LMOD_REF_COUNT_MANPATH;262,34253 -MANPATH=263,34286 -export MANPATH;264,34310 -__LMOD_REF_COUNT_MODULEPATH=265,34326 -export __LMOD_REF_COUNT_MODULEPATH;266,34384 -MODULEPATH=267,34420 -export MODULEPATH;268,34459 -unset MPICH_HOME;269,34478 -unset MYPROXY_SERVER;270,34496 -unset NAME;271,34518 -__LMOD_REF_COUNT_PATH=272,34530 -export __LMOD_REF_COUNT_PATH;273,34651 -PATH=274,34681 -export PATH;275,34771 -unset PGI;276,34784 -unset PURGE;277,34795 -unset RSHCOMMAND;278,34808 -unset SASL_PATH;279,34826 -unset __LMOD_REF_COUNT_SHLIB_PATH;280,34843 -unset SHLIB_PATH;281,34878 -unset USER_SHELL;282,34896 -_LMFILES_=283,34914 -export _LMFILES_;284,35032 -_ModuleTable_=285,35050 -export _ModuleTable_;286,35668 -unset LD_LIBRARY_PATH;292,35858 -unset LOADEDMODULES;293,35881 -unset __LMOD_REF_COUNT_MANPATH;294,35902 -unset MANPATH;295,35934 -MODULEPATH=296,35949 -export MODULEPATH;297,35988 -__LMOD_REF_COUNT_PATH=298,36007 -export __LMOD_REF_COUNT_PATH;299,36067 -PATH=300,36097 -export PATH;301,36135 -unset STTY_ARGS;302,36148 -unset SYSTEM;303,36165 -unset _LMFILES_;304,36179 -_ModuleTable_=305,36196 -export _ModuleTable_;306,36352 -export __LMOD_REF_COUNT_MODULEPATH;312,36615 -MODULEPATH=313,36651 -export MODULEPATH;314,36717 -_ModuleTable_=315,36736 -export _ModuleTable_;316,36921 -export MODULEPATH;322,37141 -_ModuleTable_=323,37160 -export _ModuleTable_;324,37345 -export LOADEDMODULES;330,37523 -MODULEPATH=331,37545 -export MODULEPATH;332,37611 -__LMOD_REF_COUNT_PATH=333,37630 -export __LMOD_REF_COUNT_PATH;334,37720 -PATH=335,37750 -export PATH;336,37815 -_LMFILES_=337,37828 -export _LMFILES_;338,37875 -_ModuleTable_=339,37893 -export _ModuleTable_;340,38236 -MODULEPATH=346,38413 -export MODULEPATH;347,38479 -__LMOD_REF_COUNT_PATH=348,38498 -export __LMOD_REF_COUNT_PATH;349,38558 -PATH=350,38588 -export PATH;351,38626 -unset _LMFILES_;352,38639 -_ModuleTable_=353,38656 -export _ModuleTable_;354,38841 -export LOADEDMODULES;360,39019 -MODULEPATH=361,39041 -export MODULEPATH;362,39107 -_LMFILES_=363,39126 -export _LMFILES_;364,39173 -_ModuleTable_=365,39191 -export _ModuleTable_;366,39544 -export LOADEDMODULES;372,39729 -MODULEPATH=373,39751 -export MODULEPATH;374,39817 -_LMFILES_=375,39836 -export _LMFILES_;376,39918 -_ModuleTable_=377,39936 -export _ModuleTable_;378,40443 -export LOADEDMODULES;384,40654 -MODULEPATH=385,40676 -export MODULEPATH;386,40742 -_LMFILES_=387,40761 -export _LMFILES_;388,40887 -_ModuleTable_=389,40905 -export _ModuleTable_;390,41602 +export _ModuleTable_;92,7296 +export MODULEPATH;98,7587 +_ModuleTable_=99,7606 +export _ModuleTable_;100,9423 +export MODULEPATH;106,9705 +_ModuleTable_=107,9724 +export _ModuleTable_;108,11541 +export MODULEPATH;114,11831 +_ModuleTable_=115,11850 +export _ModuleTable_;116,13667 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;122,14125 +LD_LIBRARY_PATH=123,14166 +export LD_LIBRARY_PATH;124,14429 +LMOD_FAMILY_COMPILER=125,14453 +export LMOD_FAMILY_COMPILER;126,14479 +LMOD_FAMILY_COMPILER_VERSION=127,14508 +export LMOD_FAMILY_COMPILER_VERSION;128,14544 +LOADEDMODULES=129,14581 +export LOADEDMODULES;130,14681 +__LMOD_REF_COUNT_MANPATH=131,14703 +export __LMOD_REF_COUNT_MANPATH;132,15074 +MANPATH=133,15107 +export MANPATH;134,15426 +__LMOD_REF_COUNT_MODULEPATH=135,15442 +export __LMOD_REF_COUNT_MODULEPATH;136,15603 +MODULEPATH=137,15639 +export MODULEPATH;138,15775 +__LMOD_REF_COUNT_PATH=139,15794 +export __LMOD_REF_COUNT_PATH;140,16177 +PATH=141,16207 +export PATH;142,16541 +PGI=143,16554 +export PGI;144,16583 +_LMFILES_=145,16595 +export _LMFILES_;146,16911 +_ModuleTable_=147,16929 +export _ModuleTable_;148,18779 +export MODULEPATH;154,19063 +_ModuleTable_=155,19082 +export _ModuleTable_;156,20932 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;162,21381 +LD_LIBRARY_PATH=163,21422 +export LD_LIBRARY_PATH;164,21685 +LMOD_FAMILY_COMPILER=165,21709 +export LMOD_FAMILY_COMPILER;166,21735 +LMOD_FAMILY_COMPILER_VERSION=167,21764 +export LMOD_FAMILY_COMPILER_VERSION;168,21798 +LOADEDMODULES=169,21835 +export LOADEDMODULES;170,21933 +__LMOD_REF_COUNT_MANPATH=171,21955 +export __LMOD_REF_COUNT_MANPATH;172,22326 +MANPATH=173,22359 +export MANPATH;174,22678 +__LMOD_REF_COUNT_MODULEPATH=175,22694 +export __LMOD_REF_COUNT_MODULEPATH;176,22853 +MODULEPATH=177,22889 +export MODULEPATH;178,23023 +__LMOD_REF_COUNT_PATH=179,23042 +export __LMOD_REF_COUNT_PATH;180,23425 +PATH=181,23455 +export PATH;182,23789 +PGI=183,23802 +export PGI;184,23829 +_LMFILES_=185,23841 +export _LMFILES_;186,24155 +_ModuleTable_=187,24173 +export _ModuleTable_;188,25990 +export MODULEPATH;194,26273 +_ModuleTable_=195,26292 +export _ModuleTable_;196,28109 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;202,28572 +LD_LIBRARY_PATH=203,28613 +export LD_LIBRARY_PATH;204,28876 +LMOD_FAMILY_COMPILER=205,28900 +export LMOD_FAMILY_COMPILER;206,28926 +LMOD_FAMILY_COMPILER_VERSION=207,28955 +export LMOD_FAMILY_COMPILER_VERSION;208,28991 +LOADEDMODULES=209,29028 +export LOADEDMODULES;210,29128 +__LMOD_REF_COUNT_MANPATH=211,29150 +export __LMOD_REF_COUNT_MANPATH;212,29521 +MANPATH=213,29554 +export MANPATH;214,29873 +__LMOD_REF_COUNT_MODULEPATH=215,29889 +export __LMOD_REF_COUNT_MODULEPATH;216,30050 +MODULEPATH=217,30086 +export MODULEPATH;218,30222 +__LMOD_REF_COUNT_PATH=219,30241 +export __LMOD_REF_COUNT_PATH;220,30624 +PATH=221,30654 +export PATH;222,30988 +PGI=223,31001 +export PGI;224,31030 +_LMFILES_=225,31042 +export _LMFILES_;226,31358 +_ModuleTable_=227,31376 +export _ModuleTable_;228,33226 +export MODULEPATH;234,33511 +_ModuleTable_=235,33530 +export _ModuleTable_;236,35380 +unset GLOBUS_HOSTNAME;242,35551 +unset GLOBUS_LOCATION;243,35574 +unset GLOBUS_PATH;244,35597 +unset GLOBUS_TCP_PORT_RANGE;245,35616 +unset GPT_LOCATION;246,35645 +unset __LMOD_REF_COUNT_INFOPATH;247,35665 +unset INFOPATH;248,35698 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=249,35714 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;250,35766 +LD_LIBRARY_PATH=251,35807 +export LD_LIBRARY_PATH;252,35840 +unset __LMOD_REF_COUNT_LIBPATH;253,35864 +unset LIBPATH;254,35896 +unset LMOD_FAMILY_COMPILER;255,35911 +unset LMOD_FAMILY_COMPILER_VERSION;256,35939 +unset LMOD_FAMILY_MPI;257,35975 +unset LMOD_FAMILY_MPI_VERSION;258,35998 +LOADEDMODULES=259,36029 +export LOADEDMODULES;260,36066 +__LMOD_REF_COUNT_MANPATH=261,36088 +export __LMOD_REF_COUNT_MANPATH;262,36131 +MANPATH=263,36164 +export MANPATH;264,36188 +__LMOD_REF_COUNT_MODULEPATH=265,36204 +export __LMOD_REF_COUNT_MODULEPATH;266,36262 +MODULEPATH=267,36298 +export MODULEPATH;268,36337 +unset MPICH_HOME;269,36356 +unset MYPROXY_SERVER;270,36374 +unset NAME;271,36396 +__LMOD_REF_COUNT_PATH=272,36408 +export __LMOD_REF_COUNT_PATH;273,36529 +PATH=274,36559 +export PATH;275,36649 +unset PGI;276,36662 +unset PURGE;277,36673 +unset RSHCOMMAND;278,36686 +unset SASL_PATH;279,36704 +unset __LMOD_REF_COUNT_SHLIB_PATH;280,36721 +unset SHLIB_PATH;281,36756 +unset USER_SHELL;282,36774 +_LMFILES_=283,36792 +export _LMFILES_;284,36910 +_ModuleTable_=285,36928 +export _ModuleTable_;286,37546 +unset LD_LIBRARY_PATH;292,37736 +unset LOADEDMODULES;293,37759 +unset __LMOD_REF_COUNT_MANPATH;294,37780 +unset MANPATH;295,37812 +MODULEPATH=296,37827 +export MODULEPATH;297,37866 +__LMOD_REF_COUNT_PATH=298,37885 +export __LMOD_REF_COUNT_PATH;299,37945 +PATH=300,37975 +export PATH;301,38013 +unset STTY_ARGS;302,38026 +unset SYSTEM;303,38043 +unset _LMFILES_;304,38057 +_ModuleTable_=305,38074 +export _ModuleTable_;306,38230 +export __LMOD_REF_COUNT_MODULEPATH;312,38493 +MODULEPATH=313,38529 +export MODULEPATH;314,38595 +_ModuleTable_=315,38614 +export _ModuleTable_;316,38799 +export MODULEPATH;322,39019 +_ModuleTable_=323,39038 +export _ModuleTable_;324,39223 +export LOADEDMODULES;330,39401 +MODULEPATH=331,39423 +export MODULEPATH;332,39489 +__LMOD_REF_COUNT_PATH=333,39508 +export __LMOD_REF_COUNT_PATH;334,39598 +PATH=335,39628 +export PATH;336,39693 +_LMFILES_=337,39706 +export _LMFILES_;338,39753 +_ModuleTable_=339,39771 +export _ModuleTable_;340,40114 +MODULEPATH=346,40291 +export MODULEPATH;347,40357 +__LMOD_REF_COUNT_PATH=348,40376 +export __LMOD_REF_COUNT_PATH;349,40436 +PATH=350,40466 +export PATH;351,40504 +unset _LMFILES_;352,40517 +_ModuleTable_=353,40534 +export _ModuleTable_;354,40719 +export LOADEDMODULES;360,40897 +MODULEPATH=361,40919 +export MODULEPATH;362,40985 +_LMFILES_=363,41004 +export _LMFILES_;364,41051 +_ModuleTable_=365,41069 +export _ModuleTable_;366,41422 +export LOADEDMODULES;372,41607 +MODULEPATH=373,41629 +export MODULEPATH;374,41695 +_LMFILES_=375,41714 +export _LMFILES_;376,41796 +_ModuleTable_=377,41814 +export _ModuleTable_;378,42321 +export LOADEDMODULES;384,42532 +MODULEPATH=385,42554 +export MODULEPATH;386,42620 +_LMFILES_=387,42639 +export _LMFILES_;388,42765 +_ModuleTable_=389,42783 +export _ModuleTable_;390,43480 rt/family/out.txt,4067 export CC;10,287 @@ -6561,99 +6559,99 @@ export TACC_HDF5_LIB;48,2059 _LMFILES_=49,2081 export _LMFILES_;50,2366 _ModuleTable_=51,2384 -export _ModuleTable_;52,3715 -export MODULEPATH;58,3991 -_ModuleTable_=59,4010 -export _ModuleTable_;60,5341 -export CC;66,5505 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=67,5516 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;68,5597 -LD_LIBRARY_PATH=69,5638 -export LD_LIBRARY_PATH;70,5700 -LMOD_FAMILY_COMPILER=71,5724 -export LMOD_FAMILY_COMPILER;72,5751 -LMOD_FAMILY_COMPILER_VERSION=73,5780 -export LMOD_FAMILY_COMPILER_VERSION;74,5816 -LMOD_FAMILY_HDF5=75,5853 -export LMOD_FAMILY_HDF5;76,5877 -LMOD_FAMILY_HDF5_VERSION=77,5902 -export LMOD_FAMILY_HDF5_VERSION;78,5935 -LMOD_FAMILY_MPI=79,5968 -export LMOD_FAMILY_MPI;80,5993 -LMOD_FAMILY_MPI_VERSION=81,6017 -export LMOD_FAMILY_MPI_VERSION;82,6048 -LOADEDMODULES=83,6080 -export LOADEDMODULES;84,6174 -__LMOD_REF_COUNT_MODULEPATH=85,6196 -export __LMOD_REF_COUNT_MODULEPATH;86,6347 -MODULEPATH=87,6383 -export MODULEPATH;88,6509 -MyMPI_Type=89,6528 -export MyMPI_Type;90,6548 -__LMOD_REF_COUNT_PATH=91,6567 -export __LMOD_REF_COUNT_PATH;92,6712 -PATH=93,6742 -export PATH;94,6859 -TACC_HDF5_BIN=95,6872 -export TACC_HDF5_BIN;96,6932 -TACC_HDF5_DIR=97,6954 -export TACC_HDF5_DIR;98,7010 -TACC_HDF5_DOC=99,7032 -export TACC_HDF5_DOC;100,7092 -TACC_HDF5_INC=101,7114 -export TACC_HDF5_INC;102,7178 -TACC_HDF5_LIB=103,7200 -export TACC_HDF5_LIB;104,7260 -_LMFILES_=105,7282 -export _LMFILES_;106,7564 -_ModuleTable_=107,7582 -export _ModuleTable_;108,8897 -export MODULEPATH;114,9172 -_ModuleTable_=115,9191 -export _ModuleTable_;116,10506 -export CC;122,10670 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=123,10681 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;124,10763 -LD_LIBRARY_PATH=125,10804 -export LD_LIBRARY_PATH;126,10867 -LMOD_FAMILY_COMPILER=127,10891 -export LMOD_FAMILY_COMPILER;128,10918 -LMOD_FAMILY_COMPILER_VERSION=129,10947 -export LMOD_FAMILY_COMPILER_VERSION;130,10984 -LMOD_FAMILY_HDF5=131,11021 -export LMOD_FAMILY_HDF5;132,11045 -LMOD_FAMILY_HDF5_VERSION=133,11070 -export LMOD_FAMILY_HDF5_VERSION;134,11103 -LMOD_FAMILY_MPI=135,11136 -export LMOD_FAMILY_MPI;136,11161 -LMOD_FAMILY_MPI_VERSION=137,11185 -export LMOD_FAMILY_MPI_VERSION;138,11216 -LOADEDMODULES=139,11248 -export LOADEDMODULES;140,11343 -__LMOD_REF_COUNT_MODULEPATH=141,11365 -export __LMOD_REF_COUNT_MODULEPATH;142,11518 -MODULEPATH=143,11554 -export MODULEPATH;144,11682 -MyMPI_Type=145,11701 -export MyMPI_Type;146,11721 -__LMOD_REF_COUNT_PATH=147,11740 -export __LMOD_REF_COUNT_PATH;148,11887 -PATH=149,11917 -export PATH;150,12036 -TACC_HDF5_BIN=151,12049 -export TACC_HDF5_BIN;152,12110 -TACC_HDF5_DIR=153,12132 -export TACC_HDF5_DIR;154,12189 -TACC_HDF5_DOC=155,12211 -export TACC_HDF5_DOC;156,12272 -TACC_HDF5_INC=157,12294 -export TACC_HDF5_INC;158,12359 -TACC_HDF5_LIB=159,12381 -export TACC_HDF5_LIB;160,12442 -_LMFILES_=161,12464 -export _LMFILES_;162,12749 -_ModuleTable_=163,12767 -export _ModuleTable_;164,14098 +export _ModuleTable_;52,3892 +export MODULEPATH;58,4168 +_ModuleTable_=59,4187 +export _ModuleTable_;60,5695 +export CC;66,5859 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=67,5870 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;68,5951 +LD_LIBRARY_PATH=69,5992 +export LD_LIBRARY_PATH;70,6054 +LMOD_FAMILY_COMPILER=71,6078 +export LMOD_FAMILY_COMPILER;72,6105 +LMOD_FAMILY_COMPILER_VERSION=73,6134 +export LMOD_FAMILY_COMPILER_VERSION;74,6170 +LMOD_FAMILY_HDF5=75,6207 +export LMOD_FAMILY_HDF5;76,6231 +LMOD_FAMILY_HDF5_VERSION=77,6256 +export LMOD_FAMILY_HDF5_VERSION;78,6289 +LMOD_FAMILY_MPI=79,6322 +export LMOD_FAMILY_MPI;80,6347 +LMOD_FAMILY_MPI_VERSION=81,6371 +export LMOD_FAMILY_MPI_VERSION;82,6402 +LOADEDMODULES=83,6434 +export LOADEDMODULES;84,6528 +__LMOD_REF_COUNT_MODULEPATH=85,6550 +export __LMOD_REF_COUNT_MODULEPATH;86,6701 +MODULEPATH=87,6737 +export MODULEPATH;88,6863 +MyMPI_Type=89,6882 +export MyMPI_Type;90,6902 +__LMOD_REF_COUNT_PATH=91,6921 +export __LMOD_REF_COUNT_PATH;92,7066 +PATH=93,7096 +export PATH;94,7213 +TACC_HDF5_BIN=95,7226 +export TACC_HDF5_BIN;96,7286 +TACC_HDF5_DIR=97,7308 +export TACC_HDF5_DIR;98,7364 +TACC_HDF5_DOC=99,7386 +export TACC_HDF5_DOC;100,7446 +TACC_HDF5_INC=101,7468 +export TACC_HDF5_INC;102,7532 +TACC_HDF5_LIB=103,7554 +export TACC_HDF5_LIB;104,7614 +_LMFILES_=105,7636 +export _LMFILES_;106,7918 +_ModuleTable_=107,7936 +export _ModuleTable_;108,9426 +export MODULEPATH;114,9701 +_ModuleTable_=115,9720 +export _ModuleTable_;116,11210 +export CC;122,11374 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=123,11385 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;124,11467 +LD_LIBRARY_PATH=125,11508 +export LD_LIBRARY_PATH;126,11571 +LMOD_FAMILY_COMPILER=127,11595 +export LMOD_FAMILY_COMPILER;128,11622 +LMOD_FAMILY_COMPILER_VERSION=129,11651 +export LMOD_FAMILY_COMPILER_VERSION;130,11688 +LMOD_FAMILY_HDF5=131,11725 +export LMOD_FAMILY_HDF5;132,11749 +LMOD_FAMILY_HDF5_VERSION=133,11774 +export LMOD_FAMILY_HDF5_VERSION;134,11807 +LMOD_FAMILY_MPI=135,11840 +export LMOD_FAMILY_MPI;136,11865 +LMOD_FAMILY_MPI_VERSION=137,11889 +export LMOD_FAMILY_MPI_VERSION;138,11920 +LOADEDMODULES=139,11952 +export LOADEDMODULES;140,12047 +__LMOD_REF_COUNT_MODULEPATH=141,12069 +export __LMOD_REF_COUNT_MODULEPATH;142,12222 +MODULEPATH=143,12258 +export MODULEPATH;144,12386 +MyMPI_Type=145,12405 +export MyMPI_Type;146,12425 +__LMOD_REF_COUNT_PATH=147,12444 +export __LMOD_REF_COUNT_PATH;148,12591 +PATH=149,12621 +export PATH;150,12740 +TACC_HDF5_BIN=151,12753 +export TACC_HDF5_BIN;152,12814 +TACC_HDF5_DIR=153,12836 +export TACC_HDF5_DIR;154,12893 +TACC_HDF5_DOC=155,12915 +export TACC_HDF5_DOC;156,12976 +TACC_HDF5_INC=157,12998 +export TACC_HDF5_INC;158,13063 +TACC_HDF5_LIB=159,13085 +export TACC_HDF5_LIB;160,13146 +_LMFILES_=161,13168 +export _LMFILES_;162,13453 +_ModuleTable_=163,13471 +export _ModuleTable_;164,14979 rt/family/family.tdesc,21 local testName 2,15 @@ -6838,10 +6836,10 @@ export MODULEPATH;32,1430 _LMFILES_=33,1449 export _LMFILES_;34,1518 _ModuleTable_=35,1536 -export _ModuleTable_;36,1964 -export MODULEPATH;42,2199 -_ModuleTable_=43,2218 -export _ModuleTable_;44,2646 +export _ModuleTable_;36,2045 +export MODULEPATH;42,2280 +_ModuleTable_=43,2299 +export _ModuleTable_;44,2808 rt/lastName/lastName.tdesc,19 testdescript 3,16 @@ -7058,7 +7056,7 @@ foo_completion 148,6413 rt/complete/complete.tdesc,21 local testName 2,15 -rt/load/out.txt,16343 +rt/load/out.txt,16351 export __LMOD_REF_COUNT_MODULEPATH;10,401 MODULEPATH=11,437 export MODULEPATH;12,503 @@ -7103,524 +7101,524 @@ export PATH;60,3709 _LMFILES_=61,3722 export _LMFILES_;62,3988 _ModuleTable_=63,4006 -export _ModuleTable_;64,5282 -export LOADEDMODULES;70,5552 -MODULEPATH=71,5574 -export MODULEPATH;72,5724 -TACC_GOTOBLAS_DIR=73,5743 -export TACC_GOTOBLAS_DIR;74,5798 -TACC_GOTOBLAS_LIB=75,5824 -export TACC_GOTOBLAS_LIB;76,5879 -_LMFILES_=77,5905 -export _LMFILES_;78,6221 -_ModuleTable_=79,6239 -export _ModuleTable_;80,7731 -export LOADEDMODULES;86,7980 -MODULEPATH=87,8002 -export MODULEPATH;88,8152 -unset TACC_GOTOBLAS_DIR;89,8171 -unset TACC_GOTOBLAS_LIB;90,8196 -_LMFILES_=91,8221 -export _LMFILES_;92,8487 -_ModuleTable_=93,8505 -export _ModuleTable_;94,9781 -export LD_LIBRARY_PATH;100,10083 -LMOD_FAMILY_COMPILER=101,10107 -export LMOD_FAMILY_COMPILER;102,10135 -LMOD_FAMILY_COMPILER_VERSION=103,10164 -export LMOD_FAMILY_COMPILER_VERSION;104,10200 -LOADEDMODULES=105,10237 -export LOADEDMODULES;106,10321 -__LMOD_REF_COUNT_MANPATH=107,10343 -export __LMOD_REF_COUNT_MANPATH;108,10540 -MANPATH=109,10573 -export MANPATH;110,10736 -MKL_DIR=111,10752 -export MKL_DIR;112,10794 -MKL_INCLUDE=113,10810 -export MKL_INCLUDE;114,10856 -MODULEPATH=115,10876 -export MODULEPATH;116,11026 -__LMOD_REF_COUNT_PATH=117,11045 -export __LMOD_REF_COUNT_PATH;118,11302 -PATH=119,11332 -export PATH;120,11543 -_LMFILES_=121,11556 -export _LMFILES_;122,11822 -_ModuleTable_=123,11840 -export _ModuleTable_;124,13116 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;130,13471 -LD_LIBRARY_PATH=131,13512 -export LD_LIBRARY_PATH;132,13679 -LOADEDMODULES=133,13703 -export LOADEDMODULES;134,13801 -MODULEPATH=135,13823 -export MODULEPATH;136,13973 -TACC_GOTOBLAS_DIR=137,13992 -export TACC_GOTOBLAS_DIR;138,14045 -TACC_GOTOBLAS_LIB=139,14071 -export TACC_GOTOBLAS_LIB;140,14124 -_LMFILES_=141,14150 -export _LMFILES_;142,14476 -_ModuleTable_=143,14494 -export _ModuleTable_;144,15975 -export LOADEDMODULES;150,16239 -MODULEPATH=151,16261 -export MODULEPATH;152,16411 -__LMOD_REF_COUNT_PATH=153,16430 -export __LMOD_REF_COUNT_PATH;154,16741 -PATH=155,16771 -export PATH;156,17021 -_FOO_BAR=157,17034 -export _FOO_BAR;158,17048 -_LMFILES_=159,17065 -export _LMFILES_;160,17434 -_ModuleTable_=161,17452 -export _ModuleTable_;162,19100 -export LOADEDMODULES;168,19355 -MODULEPATH=169,19377 -export MODULEPATH;170,19527 -__LMOD_REF_COUNT_PATH=171,19546 -export __LMOD_REF_COUNT_PATH;172,19803 -PATH=173,19833 -export PATH;174,20044 -unset _FOO_BAR;175,20057 -_LMFILES_=176,20073 -export _LMFILES_;177,20399 -_ModuleTable_=178,20417 -export _ModuleTable_;179,21898 -export LOADEDMODULES;185,22164 -MODULEPATH=186,22186 -export MODULEPATH;187,22336 -TACC_BOOST_DIR=188,22355 -export TACC_BOOST_DIR;189,22398 -_LMFILES_=190,22421 -export _LMFILES_;191,22791 -_ModuleTable_=192,22809 -export _ModuleTable_;193,24490 -export __LMOD_REF_COUNT_MODULEPATH;199,24881 -MODULEPATH=200,24917 -export MODULEPATH;201,25095 -_ModuleTable_=202,25114 -export _ModuleTable_;203,26825 -export LOADEDMODULES;209,27095 -MODULEPATH=210,27117 -export MODULEPATH;211,27295 -_LMFILES_=212,27314 -export _LMFILES_;213,27722 -_ModuleTable_=214,27740 -export _ModuleTable_;215,29605 -export MODULEPATH;226,30070 -_ModuleTable_=227,30089 -export _ModuleTable_;228,31954 -export MODULEPATH;234,32285 -_ModuleTable_=235,32304 -export _ModuleTable_;236,34169 -export LOADEDMODULES;242,34431 -MODULEPATH=243,34453 -export MODULEPATH;244,34631 -unset TACC_BOOST_DIR;245,34650 -_LMFILES_=246,34672 -export _LMFILES_;247,35036 -_ModuleTable_=248,35054 -export _ModuleTable_;249,36719 -export LOADEDMODULES;265,37284 -MODULEPATH=266,37306 -export MODULEPATH;267,37484 -TACC_BOOST_DIR=268,37503 -export TACC_BOOST_DIR;269,37546 -_LMFILES_=270,37569 -export _LMFILES_;271,37977 -_ModuleTable_=272,37995 -export _ModuleTable_;273,39860 -export ABC;279,40023 -ALEX=280,40035 -export ALEX;281,40045 -LOADEDMODULES=282,40058 -export LOADEDMODULES;283,40185 -__LMOD_REF_COUNT_MANPATH2=284,40207 -export __LMOD_REF_COUNT_MANPATH2;285,40237 -MANPATH2=286,40271 -export MANPATH2;287,40284 -MODULEPATH=288,40301 -export MODULEPATH;289,40479 -_LMFILES_=290,40498 -export _LMFILES_;291,40947 -_ModuleTable_=292,40965 -export _ModuleTable_;293,42994 -export LOADEDMODULES;299,43278 -__LMOD_REF_COUNT_MANPATH2=300,43300 -export __LMOD_REF_COUNT_MANPATH2;301,43349 -MANPATH2=302,43383 -export MANPATH2;303,43411 -MODULEPATH=304,43428 -export MODULEPATH;305,43606 -_LMFILES_=306,43625 -export _LMFILES_;307,44112 -_ModuleTable_=308,44130 -export _ModuleTable_;309,46311 -export LOADEDMODULES;315,46627 -MODULEPATH=316,46649 -export MODULEPATH;317,46827 -RTM_INTEL_VERSION=318,46846 -export RTM_INTEL_VERSION;319,46870 -_LMFILES_=320,46896 -export _LMFILES_;321,47430 -_ModuleTable_=322,47448 -export _ModuleTable_;323,49830 -export MODULEPATH;329,50157 -_ModuleTable_=330,50176 -export _ModuleTable_;331,52558 -export __LMOD_REF_COUNT_MODULEPATH;337,52977 -MODULEPATH=338,53013 -export MODULEPATH;339,53219 -_ModuleTable_=340,53238 -export _ModuleTable_;341,55650 -export __LMOD_REF_COUNT_MODULEPATH;347,56107 -MODULEPATH=348,56143 -export MODULEPATH;349,56379 -_ModuleTable_=350,56398 -export _ModuleTable_;351,58842 -export MODULEPATH;357,59235 -_ModuleTable_=358,59254 -export _ModuleTable_;359,61698 -export A_VERSION;365,61868 -B_VERSION=366,61886 -export B_VERSION;367,61901 -LOADEDMODULES=368,61919 -export LOADEDMODULES;369,62081 -MODULEPATH=370,62103 -export MODULEPATH;371,62339 -_LMFILES_=372,62358 -export _LMFILES_;373,62974 -_ModuleTable_=374,62992 -export _ModuleTable_;375,65778 -export MODULEPATH;381,66163 -_ModuleTable_=382,66182 -export _ModuleTable_;383,68968 -export MODULEPATH;394,69499 -_ModuleTable_=395,69518 -export _ModuleTable_;396,72304 -export MODULEPATH;402,72694 -_ModuleTable_=403,72713 -export _ModuleTable_;404,75499 -export MODULEPATH;410,75885 -_ModuleTable_=411,75904 -export _ModuleTable_;412,78690 -export MODULEPATH;418,79078 -_ModuleTable_=419,79097 -export _ModuleTable_;420,81883 -export C_VERSION;426,82051 -LOADEDMODULES=427,82069 -export LOADEDMODULES;428,82239 -MODULEPATH=429,82261 -export MODULEPATH;430,82497 -_LMFILES_=431,82516 -export _LMFILES_;432,83172 -_ModuleTable_=433,83190 -export _ModuleTable_;434,86152 -export MODULEPATH;440,86537 -_ModuleTable_=441,86556 -export _ModuleTable_;442,89518 -export EMPTY_STRING;448,89692 -LOADEDMODULES=449,89713 -export LOADEDMODULES;450,89883 -MODULEPATH=451,89905 -export MODULEPATH;452,90141 -RTM_INTEL_VERSION=453,90160 -export RTM_INTEL_VERSION;454,90184 -_LMFILES_=455,90210 -export _LMFILES_;456,90866 -_ModuleTable_=457,90884 -export _ModuleTable_;458,93841 -export GO_VERSION;464,94011 -LOADEDMODULES=465,94030 -export LOADEDMODULES;466,94209 -MODULEPATH=467,94231 -export MODULEPATH;468,94467 -_LMFILES_=469,94486 -export _LMFILES_;470,95179 -_ModuleTable_=471,95197 -export _ModuleTable_;472,98330 -export DEFAULT;493,98928 -LOADEDMODULES=494,98944 -export LOADEDMODULES;495,99136 -MODULEPATH=496,99158 -export MODULEPATH;497,99394 -_LMFILES_=498,99413 -export _LMFILES_;499,100147 -_ModuleTable_=500,100165 -export _ModuleTable_;501,103465 -export MODULEPATH;507,103850 -_ModuleTable_=508,103869 -export _ModuleTable_;509,107169 -export LOADEDMODULES;515,107526 -__LMOD_REF_COUNT_MANPATH=516,107548 -export __LMOD_REF_COUNT_MANPATH;517,107745 -MANPATH=518,107778 -export MANPATH;519,107941 -MODULEPATH=520,107957 -export MODULEPATH;521,108193 -__LMOD_REF_COUNT_PATH=522,108212 -export __LMOD_REF_COUNT_PATH;523,108469 -PATH=524,108499 -export PATH;525,108710 -_LMFILES_=526,108723 -export _LMFILES_;527,109457 -_ModuleTable_=528,109475 -export _ModuleTable_;529,112781 -export LOADEDMODULES;535,113138 -MODULEPATH=536,113160 -export MODULEPATH;537,113396 -_LMFILES_=538,113415 -export _LMFILES_;539,114188 -_ModuleTable_=540,114206 -export _ModuleTable_;541,117675 -export MODULEPATH;552,118211 -_ModuleTable_=553,118230 -export _ModuleTable_;554,121699 -export MODULEPATH;560,122084 -_ModuleTable_=561,122103 -export _ModuleTable_;562,125572 -export LOADEDMODULES;568,125945 -MODULEPATH=569,125967 -export MODULEPATH;570,126203 -_LMFILES_=571,126222 -export _LMFILES_;572,127039 -_ModuleTable_=573,127057 -export _ModuleTable_;574,130706 -moduleA=575,130728 -export moduleA;576,130749 -unset ADMIN_MODULE_LOADED;587,131049 -unset ALEX;588,131076 -unset A_VERSION;589,131088 -unset B_VERSION;590,131105 -unset C_VERSION;591,131122 -unset DEFAULT;592,131139 -unset EMPTY_STRING;593,131154 -unset GO_VERSION;594,131174 -unset __LMOD_REF_COUNT_INFOPATH;595,131192 -unset INFOPATH;596,131225 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;597,131241 -unset LD_LIBRARY_PATH;598,131281 -unset LMOD_FAMILY_COMPILER;599,131304 -unset LMOD_FAMILY_COMPILER_VERSION;600,131332 -unset LOADEDMODULES;601,131368 -unset __LMOD_REF_COUNT_MANPATH;602,131389 -unset MANPATH;603,131421 -unset __LMOD_REF_COUNT_MANPATH2;604,131436 -unset MANPATH2;605,131469 -unset MKL_DIR;606,131485 -unset MKL_INCLUDE;607,131500 -__LMOD_REF_COUNT_MODULEPATH=608,131519 -export __LMOD_REF_COUNT_MODULEPATH;609,131750 -MODULEPATH=610,131786 -export MODULEPATH;611,131980 -__LMOD_REF_COUNT_PATH=612,131999 -export __LMOD_REF_COUNT_PATH;613,132059 -PATH=614,132089 -export PATH;615,132127 -unset RTM_INTEL_VERSION;616,132140 -unset TACC_BOOST_DIR;617,132165 -unset TACC_GOTOBLAS_DIR;618,132187 -unset TACC_GOTOBLAS_LIB;619,132212 -unset _LMFILES_;620,132237 -_ModuleTable_=621,132254 -export _ModuleTable_;622,132532 -unset moduleA;623,132554 -export __LMOD_REF_COUNT_MODULEPATH;629,132770 -MODULEPATH=630,132806 -export MODULEPATH;631,132846 -_ModuleTable_=632,132865 -export _ModuleTable_;633,133023 -export LOADEDMODULES;639,133227 -MODULEPATH=640,133249 -export MODULEPATH;641,133289 -MY_NAME=642,133308 -export MY_NAME;643,133337 -_LMFILES_=644,133353 -export _LMFILES_;645,133416 -_ModuleTable_=646,133434 -export _ModuleTable_;647,133802 -export LOADEDMODULES;653,134002 -MODULEPATH=654,134024 -export MODULEPATH;655,134064 -_LMFILES_=656,134083 -export _LMFILES_;657,134184 -_ModuleTable_=658,134202 -export _ModuleTable_;659,134735 -export LOADEDMODULES;665,134945 -MODULEPATH=666,134967 -export MODULEPATH;667,135007 -_LMFILES_=668,135026 -export _LMFILES_;669,135165 -_ModuleTable_=670,135183 -export _ModuleTable_;671,135878 -export MODULEPATH;677,136067 -_ModuleTable_=678,136086 -export _ModuleTable_;679,136781 -MODULEPATH=685,136952 -export MODULEPATH;686,136992 -unset MY_NAME;687,137011 -unset _LMFILES_;688,137026 -_ModuleTable_=689,137043 -export _ModuleTable_;690,137201 -export LOADEDMODULES;701,137512 -__LMOD_REF_COUNT_MODULEPATH=702,137534 -export __LMOD_REF_COUNT_MODULEPATH;703,137588 -MODULEPATH=704,137624 -export MODULEPATH;705,137659 -_LMFILES_=706,137678 -export _LMFILES_;707,137722 -_ModuleTable_=708,137740 -export _ModuleTable_;709,138038 -export LOADEDMODULES;720,138355 -MODULEPATH=721,138377 -export MODULEPATH;722,138412 -_LMFILES_=723,138431 -export _LMFILES_;724,138504 -_ModuleTable_=725,138522 -export _ModuleTable_;726,138966 -export LOADEDMODULES;732,139154 -MODULEPATH=733,139176 -export MODULEPATH;734,139211 -__LMOD_REF_COUNT_TEXINPUTS=735,139230 -TEXINPUTS=737,139304 -_LMFILES_=739,139342 -export _LMFILES_;740,139450 -_ModuleTable_=741,139468 -export _ModuleTable_;742,140066 -export LOADEDMODULES;748,140270 -MODULEPATH=749,140292 -export MODULEPATH;750,140327 -RTM_D=751,140346 -export RTM_D;752,140355 -_LMFILES_=753,140369 -export _LMFILES_;754,140516 -_ModuleTable_=755,140534 -export _ModuleTable_;756,141302 -export LOADEDMODULES;762,141532 -MODULEPATH=763,141554 -export MODULEPATH;764,141589 -_LMFILES_=765,141608 -export _LMFILES_;766,141797 -_ModuleTable_=767,141815 -export _ModuleTable_;768,142777 -export MODULEPATH;774,142961 -_ModuleTable_=775,142980 -export _ModuleTable_;776,143942 -MODULEPATH=782,144113 -export MODULEPATH;783,144148 -unset RTM_A;784,144167 -unset RTM_B;785,144180 -unset RTM_C;786,144193 -unset RTM_D;787,144206 -unset __LMOD_REF_COUNT_TEXINPUTS;788,144219 -unset TEXINPUTS;789,144253 -unset _LMFILES_;790,144270 -_ModuleTable_=791,144287 -export _ModuleTable_;792,144435 -export INTEL_VERSION;798,144621 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=799,144643 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;800,144907 -LD_LIBRARY_PATH=801,144948 -export LD_LIBRARY_PATH;802,145187 -__LMOD_REF_COUNT_LM_LICENSE_FILE=803,145211 -export __LMOD_REF_COUNT_LM_LICENSE_FILE;804,145261 -LM_LICENSE_FILE=805,145302 -export LM_LICENSE_FILE;806,145333 -LOADEDMODULES=807,145357 -export LOADEDMODULES;808,145394 -__LMOD_REF_COUNT_MANPATH=809,145416 -export __LMOD_REF_COUNT_MANPATH;810,145611 -MANPATH=811,145644 -export MANPATH;812,145817 -__LMOD_REF_COUNT_MODULEPATH=813,145833 -export __LMOD_REF_COUNT_MODULEPATH;814,145887 -MODULEPATH=815,145923 -export MODULEPATH;816,145958 -__LMOD_REF_COUNT_PATH=817,145977 -export __LMOD_REF_COUNT_PATH;818,146224 -PATH=819,146254 -export PATH;820,146470 -SITE_INTEL_HOME=821,146483 -export SITE_INTEL_HOME;822,146595 -_LMFILES_=823,146619 -export _LMFILES_;824,146675 -_ModuleTable_=825,146693 -export _ModuleTable_;826,147065 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;832,147252 -unset LD_LIBRARY_PATH;833,147292 -unset __LMOD_REF_COUNT_LM_LICENSE_FILE;834,147315 -unset LM_LICENSE_FILE;835,147355 -unset LOADEDMODULES;836,147378 -unset __LMOD_REF_COUNT_MANPATH;837,147399 -unset MANPATH;838,147431 -MODULEPATH=839,147446 -export MODULEPATH;840,147481 -__LMOD_REF_COUNT_PATH=841,147500 -export __LMOD_REF_COUNT_PATH;842,147582 -PATH=843,147612 -export PATH;844,147669 -unset SITE_INTEL_HOME;845,147682 -unset _LMFILES_;846,147705 -_ModuleTable_=847,147722 -export _ModuleTable_;848,147870 -> __LMOD_REF_COUNT_PATH=ProjectDIR/rt/load:1;ProjectDIR/proj_mgmt:proj_mgmt854,148030 -> __LMOD_REF_COUNT_PATH=ProjectDIR/rt/load:1;ProjectDIR/proj_mgmt:1;PATH_to_TM:PATH_to_TM854,148030 -> __LMOD_REF_COUNT_PATH=ProjectDIR/rt/load:1;ProjectDIR/proj_mgmt:1;PATH_to_TM:1;/bin:bin854,148030 -export MODULEPATH;860,148281 -_ModuleTable_=861,148300 -export _ModuleTable_;862,148448 -export LOADEDMODULES;868,148636 -__LMOD_REF_COUNT_MODULEPATH=869,148658 -export __LMOD_REF_COUNT_MODULEPATH;870,148712 -MODULEPATH=871,148748 -export MODULEPATH;872,148783 -_LMFILES_=873,148802 -export _LMFILES_;874,148854 -_ModuleTable_=875,148872 -export _ModuleTable_;876,149198 -value=877,149220 -export value;880,149251 -MODULEPATH=886,149414 -export MODULEPATH;887,149449 -unset _LMFILES_;888,149468 -_ModuleTable_=889,149485 -export _ModuleTable_;890,149633 -unset value;891,149655 -export LOADEDMODULES;897,149903 -__LMOD_REF_COUNT_MODULEPATH=898,149925 -export __LMOD_REF_COUNT_MODULEPATH;899,149979 -MODULEPATH=900,150015 -export MODULEPATH;901,150050 -_LMFILES_=902,150069 -export _LMFILES_;903,150188 -_ModuleTable_=904,150206 -export _ModuleTable_;905,150798 -export LOADEDMODULES;911,151067 -MODULEPATH=912,151089 -export MODULEPATH;913,151124 -MY_PS1=914,151143 -export MY_PS1;915,151174 -_LMFILES_=916,151189 -export _LMFILES_;917,151349 -_ModuleTable_=918,151367 -export _ModuleTable_;919,152137 -export MODULEPATH;925,152321 -_ModuleTable_=926,152340 -export _ModuleTable_;927,153110 -export MODULEPATH;933,153295 -_ModuleTable_=934,153314 -export _ModuleTable_;935,154084 +export _ModuleTable_;64,5370 +export LOADEDMODULES;70,5640 +MODULEPATH=71,5662 +export MODULEPATH;72,5812 +TACC_GOTOBLAS_DIR=73,5831 +export TACC_GOTOBLAS_DIR;74,5886 +TACC_GOTOBLAS_LIB=75,5912 +export TACC_GOTOBLAS_LIB;76,5967 +_LMFILES_=77,5993 +export _LMFILES_;78,6309 +_ModuleTable_=79,6327 +export _ModuleTable_;80,7907 +export LOADEDMODULES;86,8156 +MODULEPATH=87,8178 +export MODULEPATH;88,8328 +unset TACC_GOTOBLAS_DIR;89,8347 +unset TACC_GOTOBLAS_LIB;90,8372 +_LMFILES_=91,8397 +export _LMFILES_;92,8663 +_ModuleTable_=93,8681 +export _ModuleTable_;94,10045 +export LD_LIBRARY_PATH;100,10347 +LMOD_FAMILY_COMPILER=101,10371 +export LMOD_FAMILY_COMPILER;102,10399 +LMOD_FAMILY_COMPILER_VERSION=103,10428 +export LMOD_FAMILY_COMPILER_VERSION;104,10464 +LOADEDMODULES=105,10501 +export LOADEDMODULES;106,10585 +__LMOD_REF_COUNT_MANPATH=107,10607 +export __LMOD_REF_COUNT_MANPATH;108,10804 +MANPATH=109,10837 +export MANPATH;110,11000 +MKL_DIR=111,11016 +export MKL_DIR;112,11058 +MKL_INCLUDE=113,11074 +export MKL_INCLUDE;114,11120 +MODULEPATH=115,11140 +export MODULEPATH;116,11290 +__LMOD_REF_COUNT_PATH=117,11309 +export __LMOD_REF_COUNT_PATH;118,11566 +PATH=119,11596 +export PATH;120,11807 +_LMFILES_=121,11820 +export _LMFILES_;122,12086 +_ModuleTable_=123,12104 +export _ModuleTable_;124,13468 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;130,13823 +LD_LIBRARY_PATH=131,13864 +export LD_LIBRARY_PATH;132,14031 +LOADEDMODULES=133,14055 +export LOADEDMODULES;134,14153 +MODULEPATH=135,14175 +export MODULEPATH;136,14325 +TACC_GOTOBLAS_DIR=137,14344 +export TACC_GOTOBLAS_DIR;138,14397 +TACC_GOTOBLAS_LIB=139,14423 +export TACC_GOTOBLAS_LIB;140,14476 +_LMFILES_=141,14502 +export _LMFILES_;142,14828 +_ModuleTable_=143,14846 +export _ModuleTable_;144,16415 +export LOADEDMODULES;150,16679 +MODULEPATH=151,16701 +export MODULEPATH;152,16851 +__LMOD_REF_COUNT_PATH=153,16870 +export __LMOD_REF_COUNT_PATH;154,17181 +PATH=155,17211 +export PATH;156,17461 +_FOO_BAR=157,17474 +export _FOO_BAR;158,17488 +_LMFILES_=159,17505 +export _LMFILES_;160,17874 +_ModuleTable_=161,17892 +export _ModuleTable_;162,19628 +export LOADEDMODULES;168,19883 +MODULEPATH=169,19905 +export MODULEPATH;170,20055 +__LMOD_REF_COUNT_PATH=171,20074 +export __LMOD_REF_COUNT_PATH;172,20331 +PATH=173,20361 +export PATH;174,20572 +unset _FOO_BAR;175,20585 +_LMFILES_=176,20601 +export _LMFILES_;177,20927 +_ModuleTable_=178,20945 +export _ModuleTable_;179,22514 +export LOADEDMODULES;185,22780 +MODULEPATH=186,22802 +export MODULEPATH;187,22952 +TACC_BOOST_DIR=188,22971 +export TACC_BOOST_DIR;189,23014 +_LMFILES_=190,23037 +export _LMFILES_;191,23407 +_ModuleTable_=192,23425 +export _ModuleTable_;193,25194 +export __LMOD_REF_COUNT_MODULEPATH;199,25585 +MODULEPATH=200,25621 +export MODULEPATH;201,25799 +_ModuleTable_=202,25818 +export _ModuleTable_;203,27617 +export LOADEDMODULES;209,27887 +MODULEPATH=210,27909 +export MODULEPATH;211,28087 +_LMFILES_=212,28106 +export _LMFILES_;213,28514 +_ModuleTable_=214,28532 +export _ModuleTable_;215,30485 +export MODULEPATH;226,30950 +_ModuleTable_=227,30969 +export _ModuleTable_;228,32922 +export MODULEPATH;234,33253 +_ModuleTable_=235,33272 +export _ModuleTable_;236,35225 +export LOADEDMODULES;242,35487 +MODULEPATH=243,35509 +export MODULEPATH;244,35687 +unset TACC_BOOST_DIR;245,35706 +_LMFILES_=246,35728 +export _LMFILES_;247,36092 +_ModuleTable_=248,36110 +export _ModuleTable_;249,37863 +export LOADEDMODULES;265,38428 +MODULEPATH=266,38450 +export MODULEPATH;267,38628 +TACC_BOOST_DIR=268,38647 +export TACC_BOOST_DIR;269,38690 +_LMFILES_=270,38713 +export _LMFILES_;271,39121 +_ModuleTable_=272,39139 +export _ModuleTable_;273,41092 +export ABC;279,41255 +ALEX=280,41267 +export ALEX;281,41277 +LOADEDMODULES=282,41290 +export LOADEDMODULES;283,41417 +__LMOD_REF_COUNT_MANPATH2=284,41439 +export __LMOD_REF_COUNT_MANPATH2;285,41469 +MANPATH2=286,41503 +export MANPATH2;287,41516 +MODULEPATH=288,41533 +export MODULEPATH;289,41711 +_LMFILES_=290,41730 +export _LMFILES_;291,42179 +_ModuleTable_=292,42197 +export _ModuleTable_;293,44314 +export LOADEDMODULES;299,44598 +__LMOD_REF_COUNT_MANPATH2=300,44620 +export __LMOD_REF_COUNT_MANPATH2;301,44669 +MANPATH2=302,44703 +export MANPATH2;303,44731 +MODULEPATH=304,44748 +export MODULEPATH;305,44926 +_LMFILES_=306,44945 +export _LMFILES_;307,45432 +_ModuleTable_=308,45450 +export _ModuleTable_;309,47719 +export LOADEDMODULES;315,48035 +MODULEPATH=316,48057 +export MODULEPATH;317,48235 +RTM_INTEL_VERSION=318,48254 +export RTM_INTEL_VERSION;319,48278 +_LMFILES_=320,48304 +export _LMFILES_;321,48838 +_ModuleTable_=322,48856 +export _ModuleTable_;323,51326 +export MODULEPATH;329,51653 +_ModuleTable_=330,51672 +export _ModuleTable_;331,54142 +export __LMOD_REF_COUNT_MODULEPATH;337,54561 +MODULEPATH=338,54597 +export MODULEPATH;339,54803 +_ModuleTable_=340,54822 +export _ModuleTable_;341,57322 +export __LMOD_REF_COUNT_MODULEPATH;347,57779 +MODULEPATH=348,57815 +export MODULEPATH;349,58051 +_ModuleTable_=350,58070 +export _ModuleTable_;351,60602 +export MODULEPATH;357,60995 +_ModuleTable_=358,61014 +export _ModuleTable_;359,63546 +export A_VERSION;365,63716 +B_VERSION=366,63734 +export B_VERSION;367,63749 +LOADEDMODULES=368,63767 +export LOADEDMODULES;369,63929 +MODULEPATH=370,63951 +export MODULEPATH;371,64187 +_LMFILES_=372,64206 +export _LMFILES_;373,64822 +_ModuleTable_=374,64840 +export _ModuleTable_;375,67714 +export MODULEPATH;381,68099 +_ModuleTable_=382,68118 +export _ModuleTable_;383,70992 +export MODULEPATH;394,71523 +_ModuleTable_=395,71542 +export _ModuleTable_;396,74416 +export MODULEPATH;402,74806 +_ModuleTable_=403,74825 +export _ModuleTable_;404,77699 +export MODULEPATH;410,78085 +_ModuleTable_=411,78104 +export _ModuleTable_;412,80978 +export MODULEPATH;418,81366 +_ModuleTable_=419,81385 +export _ModuleTable_;420,84259 +export C_VERSION;426,84427 +LOADEDMODULES=427,84445 +export LOADEDMODULES;428,84615 +MODULEPATH=429,84637 +export MODULEPATH;430,84873 +_LMFILES_=431,84892 +export _LMFILES_;432,85548 +_ModuleTable_=433,85566 +export _ModuleTable_;434,88616 +export MODULEPATH;440,89001 +_ModuleTable_=441,89020 +export _ModuleTable_;442,92070 +export EMPTY_STRING;448,92244 +LOADEDMODULES=449,92265 +export LOADEDMODULES;450,92435 +MODULEPATH=451,92457 +export MODULEPATH;452,92693 +RTM_INTEL_VERSION=453,92712 +export RTM_INTEL_VERSION;454,92736 +_LMFILES_=455,92762 +export _LMFILES_;456,93418 +_ModuleTable_=457,93436 +export _ModuleTable_;458,96481 +export GO_VERSION;464,96651 +LOADEDMODULES=465,96670 +export LOADEDMODULES;466,96849 +MODULEPATH=467,96871 +export MODULEPATH;468,97107 +_LMFILES_=469,97126 +export _LMFILES_;470,97819 +_ModuleTable_=471,97837 +export _ModuleTable_;472,101058 +export DEFAULT;493,101656 +LOADEDMODULES=494,101672 +export LOADEDMODULES;495,101864 +MODULEPATH=496,101886 +export MODULEPATH;497,102122 +_LMFILES_=498,102141 +export _LMFILES_;499,102875 +_ModuleTable_=500,102893 +export _ModuleTable_;501,106281 +export MODULEPATH;507,106666 +_ModuleTable_=508,106685 +export _ModuleTable_;509,110073 +export LOADEDMODULES;515,110430 +__LMOD_REF_COUNT_MANPATH=516,110452 +export __LMOD_REF_COUNT_MANPATH;517,110649 +MANPATH=518,110682 +export MANPATH;519,110845 +MODULEPATH=520,110861 +export MODULEPATH;521,111097 +__LMOD_REF_COUNT_PATH=522,111116 +export __LMOD_REF_COUNT_PATH;523,111373 +PATH=524,111403 +export PATH;525,111614 +_LMFILES_=526,111627 +export _LMFILES_;527,112361 +_ModuleTable_=528,112379 +export _ModuleTable_;529,115773 +export LOADEDMODULES;535,116130 +MODULEPATH=536,116152 +export MODULEPATH;537,116388 +_LMFILES_=538,116407 +export _LMFILES_;539,117180 +_ModuleTable_=540,117198 +export _ModuleTable_;541,120755 +export MODULEPATH;552,121291 +_ModuleTable_=553,121310 +export _ModuleTable_;554,124867 +export MODULEPATH;560,125252 +_ModuleTable_=561,125271 +export _ModuleTable_;562,128828 +export LOADEDMODULES;568,129201 +MODULEPATH=569,129223 +export MODULEPATH;570,129459 +_LMFILES_=571,129478 +export _LMFILES_;572,130295 +_ModuleTable_=573,130313 +export _ModuleTable_;574,134050 +moduleA=575,134072 +export moduleA;576,134093 +unset ADMIN_MODULE_LOADED;587,134393 +unset ALEX;588,134420 +unset A_VERSION;589,134432 +unset B_VERSION;590,134449 +unset C_VERSION;591,134466 +unset DEFAULT;592,134483 +unset EMPTY_STRING;593,134498 +unset GO_VERSION;594,134518 +unset __LMOD_REF_COUNT_INFOPATH;595,134536 +unset INFOPATH;596,134569 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;597,134585 +unset LD_LIBRARY_PATH;598,134625 +unset LMOD_FAMILY_COMPILER;599,134648 +unset LMOD_FAMILY_COMPILER_VERSION;600,134676 +unset LOADEDMODULES;601,134712 +unset __LMOD_REF_COUNT_MANPATH;602,134733 +unset MANPATH;603,134765 +unset __LMOD_REF_COUNT_MANPATH2;604,134780 +unset MANPATH2;605,134813 +unset MKL_DIR;606,134829 +unset MKL_INCLUDE;607,134844 +__LMOD_REF_COUNT_MODULEPATH=608,134863 +export __LMOD_REF_COUNT_MODULEPATH;609,135094 +MODULEPATH=610,135130 +export MODULEPATH;611,135324 +__LMOD_REF_COUNT_PATH=612,135343 +export __LMOD_REF_COUNT_PATH;613,135403 +PATH=614,135433 +export PATH;615,135471 +unset RTM_INTEL_VERSION;616,135484 +unset TACC_BOOST_DIR;617,135509 +unset TACC_GOTOBLAS_DIR;618,135531 +unset TACC_GOTOBLAS_LIB;619,135556 +unset _LMFILES_;620,135581 +_ModuleTable_=621,135598 +export _ModuleTable_;622,135876 +unset moduleA;623,135898 +export __LMOD_REF_COUNT_MODULEPATH;629,136114 +MODULEPATH=630,136150 +export MODULEPATH;631,136190 +_ModuleTable_=632,136209 +export _ModuleTable_;633,136367 +export LOADEDMODULES;639,136571 +MODULEPATH=640,136593 +export MODULEPATH;641,136633 +MY_NAME=642,136652 +export MY_NAME;643,136681 +_LMFILES_=644,136697 +export _LMFILES_;645,136760 +_ModuleTable_=646,136778 +export _ModuleTable_;647,137146 +export LOADEDMODULES;653,137346 +MODULEPATH=654,137368 +export MODULEPATH;655,137408 +_LMFILES_=656,137427 +export _LMFILES_;657,137528 +_ModuleTable_=658,137546 +export _ModuleTable_;659,138079 +export LOADEDMODULES;665,138289 +MODULEPATH=666,138311 +export MODULEPATH;667,138351 +_LMFILES_=668,138370 +export _LMFILES_;669,138509 +_ModuleTable_=670,138527 +export _ModuleTable_;671,139222 +export MODULEPATH;677,139411 +_ModuleTable_=678,139430 +export _ModuleTable_;679,140125 +MODULEPATH=685,140296 +export MODULEPATH;686,140336 +unset MY_NAME;687,140355 +unset _LMFILES_;688,140370 +_ModuleTable_=689,140387 +export _ModuleTable_;690,140545 +export LOADEDMODULES;701,140856 +__LMOD_REF_COUNT_MODULEPATH=702,140878 +export __LMOD_REF_COUNT_MODULEPATH;703,140932 +MODULEPATH=704,140968 +export MODULEPATH;705,141003 +_LMFILES_=706,141022 +export _LMFILES_;707,141066 +_ModuleTable_=708,141084 +export _ModuleTable_;709,141382 +export LOADEDMODULES;720,141699 +MODULEPATH=721,141721 +export MODULEPATH;722,141756 +_LMFILES_=723,141775 +export _LMFILES_;724,141848 +_ModuleTable_=725,141866 +export _ModuleTable_;726,142310 +export LOADEDMODULES;732,142498 +MODULEPATH=733,142520 +export MODULEPATH;734,142555 +__LMOD_REF_COUNT_TEXINPUTS=735,142574 +TEXINPUTS=737,142648 +_LMFILES_=739,142686 +export _LMFILES_;740,142794 +_ModuleTable_=741,142812 +export _ModuleTable_;742,143410 +export LOADEDMODULES;748,143614 +MODULEPATH=749,143636 +export MODULEPATH;750,143671 +RTM_D=751,143690 +export RTM_D;752,143699 +_LMFILES_=753,143713 +export _LMFILES_;754,143860 +_ModuleTable_=755,143878 +export _ModuleTable_;756,144646 +export LOADEDMODULES;762,144876 +MODULEPATH=763,144898 +export MODULEPATH;764,144933 +_LMFILES_=765,144952 +export _LMFILES_;766,145141 +_ModuleTable_=767,145159 +export _ModuleTable_;768,146121 +export MODULEPATH;774,146305 +_ModuleTable_=775,146324 +export _ModuleTable_;776,147286 +MODULEPATH=782,147457 +export MODULEPATH;783,147492 +unset RTM_A;784,147511 +unset RTM_B;785,147524 +unset RTM_C;786,147537 +unset RTM_D;787,147550 +unset __LMOD_REF_COUNT_TEXINPUTS;788,147563 +unset TEXINPUTS;789,147597 +unset _LMFILES_;790,147614 +_ModuleTable_=791,147631 +export _ModuleTable_;792,147779 +export INTEL_VERSION;798,147965 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=799,147987 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;800,148251 +LD_LIBRARY_PATH=801,148292 +export LD_LIBRARY_PATH;802,148531 +__LMOD_REF_COUNT_LM_LICENSE_FILE=803,148555 +export __LMOD_REF_COUNT_LM_LICENSE_FILE;804,148605 +LM_LICENSE_FILE=805,148646 +export LM_LICENSE_FILE;806,148677 +LOADEDMODULES=807,148701 +export LOADEDMODULES;808,148738 +__LMOD_REF_COUNT_MANPATH=809,148760 +export __LMOD_REF_COUNT_MANPATH;810,148955 +MANPATH=811,148988 +export MANPATH;812,149161 +__LMOD_REF_COUNT_MODULEPATH=813,149177 +export __LMOD_REF_COUNT_MODULEPATH;814,149231 +MODULEPATH=815,149267 +export MODULEPATH;816,149302 +__LMOD_REF_COUNT_PATH=817,149321 +export __LMOD_REF_COUNT_PATH;818,149568 +PATH=819,149598 +export PATH;820,149814 +SITE_INTEL_HOME=821,149827 +export SITE_INTEL_HOME;822,149939 +_LMFILES_=823,149963 +export _LMFILES_;824,150019 +_ModuleTable_=825,150037 +export _ModuleTable_;826,150409 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;832,150596 +unset LD_LIBRARY_PATH;833,150636 +unset __LMOD_REF_COUNT_LM_LICENSE_FILE;834,150659 +unset LM_LICENSE_FILE;835,150699 +unset LOADEDMODULES;836,150722 +unset __LMOD_REF_COUNT_MANPATH;837,150743 +unset MANPATH;838,150775 +MODULEPATH=839,150790 +export MODULEPATH;840,150825 +__LMOD_REF_COUNT_PATH=841,150844 +export __LMOD_REF_COUNT_PATH;842,150926 +PATH=843,150956 +export PATH;844,151013 +unset SITE_INTEL_HOME;845,151026 +unset _LMFILES_;846,151049 +_ModuleTable_=847,151066 +export _ModuleTable_;848,151214 +> __LMOD_REF_COUNT_PATH=ProjectDIR/rt/load:1;ProjectDIR/proj_mgmt:proj_mgmt854,151374 +> __LMOD_REF_COUNT_PATH=ProjectDIR/rt/load:1;ProjectDIR/proj_mgmt:1;PATH_to_TM:PATH_to_TM854,151374 +> __LMOD_REF_COUNT_PATH=ProjectDIR/rt/load:1;ProjectDIR/proj_mgmt:1;PATH_to_TM:1;/bin:bin854,151374 +export MODULEPATH;860,151625 +_ModuleTable_=861,151644 +export _ModuleTable_;862,151792 +export LOADEDMODULES;868,151980 +__LMOD_REF_COUNT_MODULEPATH=869,152002 +export __LMOD_REF_COUNT_MODULEPATH;870,152056 +MODULEPATH=871,152092 +export MODULEPATH;872,152127 +_LMFILES_=873,152146 +export _LMFILES_;874,152198 +_ModuleTable_=875,152216 +export _ModuleTable_;876,152542 +value=877,152564 +export value;880,152595 +MODULEPATH=886,152758 +export MODULEPATH;887,152793 +unset _LMFILES_;888,152812 +_ModuleTable_=889,152829 +export _ModuleTable_;890,152977 +unset value;891,152999 +export LOADEDMODULES;897,153247 +__LMOD_REF_COUNT_MODULEPATH=898,153269 +export __LMOD_REF_COUNT_MODULEPATH;899,153323 +MODULEPATH=900,153359 +export MODULEPATH;901,153394 +_LMFILES_=902,153413 +export _LMFILES_;903,153532 +_ModuleTable_=904,153550 +export _ModuleTable_;905,154142 +export LOADEDMODULES;911,154411 +MODULEPATH=912,154433 +export MODULEPATH;913,154468 +MY_PS1=914,154487 +export MY_PS1;915,154518 +_LMFILES_=916,154533 +export _LMFILES_;917,154693 +_ModuleTable_=918,154711 +export _ModuleTable_;919,155481 +export MODULEPATH;925,155665 +_ModuleTable_=926,155684 +export _ModuleTable_;927,156454 +export MODULEPATH;933,156639 +_ModuleTable_=934,156658 +export _ModuleTable_;935,157428 rt/load/err.txt,591 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule132,5754 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule141,6259 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule220,9460 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule341,14352 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule350,14836 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule359,15341 +Also make sure that all modulefiles written in TCL start with the string #%ModuleModule132,5752 +Also make sure that all modulefiles written in TCL start with the string #%ModuleModule141,6257 +Also make sure that all modulefiles written in TCL start with the string #%ModuleModule220,9458 +Also make sure that all modulefiles written in TCL start with the string #%ModuleModule341,14350 +Also make sure that all modulefiles written in TCL start with the string #%ModuleModule350,14834 +Also make sure that all modulefiles written in TCL start with the string #%ModuleModule359,15339 rt/load/load.tdesc,19 testdescript 3,16 @@ -7638,7 +7636,7 @@ export MODULEPATH;20,789 _ModuleTable_=21,808 export _ModuleTable_;22,927 -rt/pkg/out.txt,3830 +rt/pkg/out.txt,3839 export __LMOD_REF_COUNT_LD_LIBRARY_PATH;10,337 LD_LIBRARY_PATH=11,378 export LD_LIBRARY_PATH;12,429 @@ -7671,102 +7669,102 @@ export PATH;38,1537 _LMFILES_=39,1550 export _LMFILES_;40,1655 _ModuleTable_=41,1673 -export _ModuleTable_;42,2321 -export LMOD_BOOST_INC;48,2537 -LMOD_BOOST_LIB=49,2560 -export LMOD_BOOST_LIB;50,2611 -LMOD_PMETIS_DIR=51,2634 -export LMOD_PMETIS_DIR;52,2692 -LMOD_PMETIS_INC=53,2716 -export LMOD_PMETIS_INC;54,2782 -LMOD_PMETIS_LIB=55,2806 -export LMOD_PMETIS_LIB;56,2868 -LOADEDMODULES=57,2892 -export LOADEDMODULES;58,2955 -MODULEPATH=59,2977 -export MODULEPATH;60,3096 -_LMFILES_=61,3115 -export _LMFILES_;62,3335 -_ModuleTable_=63,3353 -export _ModuleTable_;64,4418 -export MODULEPATH;70,4691 -_ModuleTable_=71,4710 -export _ModuleTable_;72,5775 -export MODULEPATH;78,6049 -_ModuleTable_=79,6068 -export _ModuleTable_;80,7133 -export MODULEPATH;86,7406 -_ModuleTable_=87,7425 -export _ModuleTable_;88,8490 -export __LMOD_REF_COUNT_CPATH;94,8887 -CPATH=95,8918 -export CPATH;96,9129 -__LMOD_REF_COUNT_INCLUDE=97,9143 -export __LMOD_REF_COUNT_INCLUDE;98,9262 -INCLUDE=99,9295 -export INCLUDE;100,9392 -__LMOD_REF_COUNT_INTEL_LICENSE_FILE=101,9408 -export __LMOD_REF_COUNT_INTEL_LICENSE_FILE;102,9502 -INTEL_LICENSE_FILE=103,9546 -export INTEL_LICENSE_FILE;104,9621 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=105,9648 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;106,10053 -LD_LIBRARY_PATH=107,10094 -export LD_LIBRARY_PATH;108,10465 -__LMOD_REF_COUNT_LIBRARY_PATH=109,10489 -export __LMOD_REF_COUNT_LIBRARY_PATH;110,10714 -LIBRARY_PATH=111,10752 -export LIBRARY_PATH;112,10952 -LMOD_BOOST_INC=113,10973 -export LMOD_BOOST_INC;114,11031 -LMOD_BOOST_LIB=115,11054 -export LMOD_BOOST_LIB;116,11108 -LMOD_FAMILY_COMPILER=117,11131 -export LMOD_FAMILY_COMPILER;118,11159 -LMOD_FAMILY_COMPILER_VERSION=119,11188 -export LMOD_FAMILY_COMPILER_VERSION;120,11225 -LMOD_FAMILY_MPI=121,11262 -export LMOD_FAMILY_MPI;122,11285 -LMOD_FAMILY_MPI_VERSION=123,11309 -export LMOD_FAMILY_MPI_VERSION;124,11340 -LMOD_PMETIS_DIR=125,11372 -export LMOD_PMETIS_DIR;126,11433 -LMOD_PMETIS_INC=127,11457 -export LMOD_PMETIS_INC;128,11526 -LMOD_PMETIS_LIB=129,11550 -export LMOD_PMETIS_LIB;130,11615 -LOADEDMODULES=131,11639 -export LOADEDMODULES;132,11705 -__LMOD_REF_COUNT_MANPATH=133,11727 -export __LMOD_REF_COUNT_MANPATH;134,11851 -MANPATH=135,11884 -export MANPATH;136,11986 -__LMOD_REF_COUNT_MODULEPATH=137,12002 -export __LMOD_REF_COUNT_MODULEPATH;138,12152 -MODULEPATH=139,12188 -export MODULEPATH;140,12313 -MPICH_HOME=141,12332 -export MPICH_HOME;142,12377 -MPIHOME=143,12396 -export MPIHOME;144,12438 -__LMOD_REF_COUNT_NLSPATH=145,12454 -export __LMOD_REF_COUNT_NLSPATH;146,12809 -NLSPATH=147,12842 -export NLSPATH;148,13169 -__LMOD_REF_COUNT_PATH=149,13185 -export __LMOD_REF_COUNT_PATH;150,13421 -PATH=151,13451 -export PATH;152,13653 -_LMFILES_=153,13666 -export _LMFILES_;154,13898 -_ModuleTable_=155,13916 -export _ModuleTable_;156,14998 -export MODULEPATH;162,15277 -_ModuleTable_=163,15296 -export _ModuleTable_;164,16378 -export MODULEPATH;170,16651 -_ModuleTable_=171,16670 -export _ModuleTable_;172,17752 +export _ModuleTable_;42,2494 +export LMOD_BOOST_INC;48,2710 +LMOD_BOOST_LIB=49,2733 +export LMOD_BOOST_LIB;50,2784 +LMOD_PMETIS_DIR=51,2807 +export LMOD_PMETIS_DIR;52,2865 +LMOD_PMETIS_INC=53,2889 +export LMOD_PMETIS_INC;54,2955 +LMOD_PMETIS_LIB=55,2979 +export LMOD_PMETIS_LIB;56,3041 +LOADEDMODULES=57,3065 +export LOADEDMODULES;58,3128 +MODULEPATH=59,3150 +export MODULEPATH;60,3269 +_LMFILES_=61,3288 +export _LMFILES_;62,3508 +_ModuleTable_=63,3526 +export _ModuleTable_;64,4764 +export MODULEPATH;70,5037 +_ModuleTable_=71,5056 +export _ModuleTable_;72,6294 +export MODULEPATH;78,6568 +_ModuleTable_=79,6587 +export _ModuleTable_;80,7825 +export MODULEPATH;86,8098 +_ModuleTable_=87,8117 +export _ModuleTable_;88,9355 +export __LMOD_REF_COUNT_CPATH;94,9752 +CPATH=95,9783 +export CPATH;96,9994 +__LMOD_REF_COUNT_INCLUDE=97,10008 +export __LMOD_REF_COUNT_INCLUDE;98,10127 +INCLUDE=99,10160 +export INCLUDE;100,10257 +__LMOD_REF_COUNT_INTEL_LICENSE_FILE=101,10273 +export __LMOD_REF_COUNT_INTEL_LICENSE_FILE;102,10367 +INTEL_LICENSE_FILE=103,10411 +export INTEL_LICENSE_FILE;104,10486 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=105,10513 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;106,10918 +LD_LIBRARY_PATH=107,10959 +export LD_LIBRARY_PATH;108,11330 +__LMOD_REF_COUNT_LIBRARY_PATH=109,11354 +export __LMOD_REF_COUNT_LIBRARY_PATH;110,11579 +LIBRARY_PATH=111,11617 +export LIBRARY_PATH;112,11817 +LMOD_BOOST_INC=113,11838 +export LMOD_BOOST_INC;114,11896 +LMOD_BOOST_LIB=115,11919 +export LMOD_BOOST_LIB;116,11973 +LMOD_FAMILY_COMPILER=117,11996 +export LMOD_FAMILY_COMPILER;118,12024 +LMOD_FAMILY_COMPILER_VERSION=119,12053 +export LMOD_FAMILY_COMPILER_VERSION;120,12090 +LMOD_FAMILY_MPI=121,12127 +export LMOD_FAMILY_MPI;122,12150 +LMOD_FAMILY_MPI_VERSION=123,12174 +export LMOD_FAMILY_MPI_VERSION;124,12205 +LMOD_PMETIS_DIR=125,12237 +export LMOD_PMETIS_DIR;126,12298 +LMOD_PMETIS_INC=127,12322 +export LMOD_PMETIS_INC;128,12391 +LMOD_PMETIS_LIB=129,12415 +export LMOD_PMETIS_LIB;130,12480 +LOADEDMODULES=131,12504 +export LOADEDMODULES;132,12570 +__LMOD_REF_COUNT_MANPATH=133,12592 +export __LMOD_REF_COUNT_MANPATH;134,12716 +MANPATH=135,12749 +export MANPATH;136,12851 +__LMOD_REF_COUNT_MODULEPATH=137,12867 +export __LMOD_REF_COUNT_MODULEPATH;138,13017 +MODULEPATH=139,13053 +export MODULEPATH;140,13178 +MPICH_HOME=141,13197 +export MPICH_HOME;142,13242 +MPIHOME=143,13261 +export MPIHOME;144,13303 +__LMOD_REF_COUNT_NLSPATH=145,13319 +export __LMOD_REF_COUNT_NLSPATH;146,13674 +NLSPATH=147,13707 +export NLSPATH;148,14034 +__LMOD_REF_COUNT_PATH=149,14050 +export __LMOD_REF_COUNT_PATH;150,14286 +PATH=151,14316 +export PATH;152,14518 +_LMFILES_=153,14531 +export _LMFILES_;154,14763 +_ModuleTable_=155,14781 +export _ModuleTable_;156,16042 +export MODULEPATH;162,16321 +_ModuleTable_=163,16340 +export _ModuleTable_;164,17601 +export MODULEPATH;170,17874 +_ModuleTable_=171,17893 +export _ModuleTable_;172,19154 rt/pkg/pkg.tdesc,21 local testName 3,16 @@ -8083,55 +8081,55 @@ export MODULEPATH;28,1134 _LMFILES_=29,1153 export _LMFILES_;30,1208 _ModuleTable_=31,1226 -export _ModuleTable_;32,1619 -export LMOD_FAMILY_MPI;38,1804 -LMOD_FAMILY_MPI_VERSION=39,1828 -export LMOD_FAMILY_MPI_VERSION;40,1859 -LOADEDMODULES=41,1891 -export LOADEDMODULES;42,1940 -__LMOD_REF_COUNT_MODULEPATH=43,1962 -export __LMOD_REF_COUNT_MODULEPATH;44,2122 -MODULEPATH=45,2158 -export MODULEPATH;46,2293 -PETSC_VERSION=47,2312 -export PETSC_VERSION;48,2331 -_LMFILES_=49,2353 -export _LMFILES_;50,2533 -_ModuleTable_=51,2551 -export _ModuleTable_;52,3419 -export MODULEPATH;58,3703 -_ModuleTable_=59,3722 -export _ModuleTable_;60,4590 -export MODULEPATH;66,4873 -_ModuleTable_=67,4892 -export _ModuleTable_;68,5760 -unset LMOD_FAMILY_COMPILER_VERSION;74,5944 -unset LMOD_FAMILY_MPI;75,5980 -unset LMOD_FAMILY_MPI_VERSION;76,6003 -unset LOADEDMODULES;77,6034 -__LMOD_REF_COUNT_MODULEPATH=78,6055 -export __LMOD_REF_COUNT_MODULEPATH;79,6115 -MODULEPATH=80,6151 -export MODULEPATH;81,6192 -unset PETSC_VERSION;82,6211 -unset _LMFILES_;83,6232 -_ModuleTable_=84,6249 -export _ModuleTable_;85,6825 -export LOADEDMODULES;91,6996 -MODULEPATH=92,7018 -export MODULEPATH;93,7059 -TOTO=94,7078 -export TOTO;95,7097 -_LMFILES_=96,7110 -export _LMFILES_;97,7160 -_ModuleTable_=98,7178 -export _ModuleTable_;99,7906 -MODULEPATH=105,8079 -export MODULEPATH;106,8120 -unset TOTO;107,8139 -unset _LMFILES_;108,8151 -_ModuleTable_=109,8168 -export _ModuleTable_;110,8744 +export _ModuleTable_;32,1709 +export LMOD_FAMILY_MPI;38,1894 +LMOD_FAMILY_MPI_VERSION=39,1918 +export LMOD_FAMILY_MPI_VERSION;40,1949 +LOADEDMODULES=41,1981 +export LOADEDMODULES;42,2030 +__LMOD_REF_COUNT_MODULEPATH=43,2052 +export __LMOD_REF_COUNT_MODULEPATH;44,2212 +MODULEPATH=45,2248 +export MODULEPATH;46,2383 +PETSC_VERSION=47,2402 +export PETSC_VERSION;48,2421 +_LMFILES_=49,2443 +export _LMFILES_;50,2623 +_ModuleTable_=51,2641 +export _ModuleTable_;52,3695 +export MODULEPATH;58,3979 +_ModuleTable_=59,3998 +export _ModuleTable_;60,5052 +export MODULEPATH;66,5335 +_ModuleTable_=67,5354 +export _ModuleTable_;68,6408 +unset LMOD_FAMILY_COMPILER_VERSION;74,6592 +unset LMOD_FAMILY_MPI;75,6628 +unset LMOD_FAMILY_MPI_VERSION;76,6651 +unset LOADEDMODULES;77,6682 +__LMOD_REF_COUNT_MODULEPATH=78,6703 +export __LMOD_REF_COUNT_MODULEPATH;79,6763 +MODULEPATH=80,6799 +export MODULEPATH;81,6840 +unset PETSC_VERSION;82,6859 +unset _LMFILES_;83,6880 +_ModuleTable_=84,6897 +export _ModuleTable_;85,7473 +export LOADEDMODULES;91,7644 +MODULEPATH=92,7666 +export MODULEPATH;93,7707 +TOTO=94,7726 +export TOTO;95,7745 +_LMFILES_=96,7758 +export _LMFILES_;97,7808 +_ModuleTable_=98,7826 +export _ModuleTable_;99,8554 +MODULEPATH=105,8727 +export MODULEPATH;106,8768 +unset TOTO;107,8787 +unset _LMFILES_;108,8799 +_ModuleTable_=109,8816 +export _ModuleTable_;110,9392 rt/zsh_to_modulefile/tstScript.zsh,74 OLD_IFS=4,36 @@ -8252,39 +8250,39 @@ export MODULEPATH;22,821 _LMFILES_=23,840 export _LMFILES_;24,931 _ModuleTable_=25,949 -export _ModuleTable_;26,1534 -export MODULEPATH;32,1797 -_ModuleTable_=33,1816 -export _ModuleTable_;34,2401 -export MODULEPATH;40,2649 -_ModuleTable_=41,2668 -export _ModuleTable_;42,3253 -export MODULEPATH;48,3505 -_ModuleTable_=49,3524 -export _ModuleTable_;50,4109 -export ITAC_VERSION;56,4280 -LOADEDMODULES=57,4301 -export LOADEDMODULES;58,4346 -MODULEPATH=59,4368 -export MODULEPATH;60,4467 -_LMFILES_=61,4486 -export _LMFILES_;62,4608 -_ModuleTable_=63,4626 -export _ModuleTable_;64,5364 -unset LMOD_FAMILY_MPI_VERSION;70,5541 -LOADEDMODULES=71,5572 -export LOADEDMODULES;72,5609 -__LMOD_REF_COUNT_MODULEPATH=73,5631 -export __LMOD_REF_COUNT_MODULEPATH;74,5716 -MODULEPATH=75,5752 -export MODULEPATH;76,5815 -_LMFILES_=77,5834 -export _LMFILES_;78,5911 -_ModuleTable_=79,5929 -export _ModuleTable_;80,6455 -export MODULEPATH;86,6666 -_ModuleTable_=87,6685 -export _ModuleTable_;88,7211 +export _ModuleTable_;26,1695 +export MODULEPATH;32,1958 +_ModuleTable_=33,1977 +export _ModuleTable_;34,2723 +export MODULEPATH;40,2971 +_ModuleTable_=41,2990 +export _ModuleTable_;42,3736 +export MODULEPATH;48,3988 +_ModuleTable_=49,4007 +export _ModuleTable_;50,4753 +export ITAC_VERSION;56,4924 +LOADEDMODULES=57,4945 +export LOADEDMODULES;58,4990 +MODULEPATH=59,5012 +export MODULEPATH;60,5111 +_LMFILES_=61,5130 +export _LMFILES_;62,5252 +_ModuleTable_=63,5270 +export _ModuleTable_;64,6169 +unset LMOD_FAMILY_MPI_VERSION;70,6346 +LOADEDMODULES=71,6377 +export LOADEDMODULES;72,6414 +__LMOD_REF_COUNT_MODULEPATH=73,6436 +export __LMOD_REF_COUNT_MODULEPATH;74,6521 +MODULEPATH=75,6557 +export MODULEPATH;76,6620 +_LMFILES_=77,6639 +export _LMFILES_;78,6716 +_ModuleTable_=79,6734 +export _ModuleTable_;80,7339 +export MODULEPATH;86,7550 +_ModuleTable_=87,7569 +export _ModuleTable_;88,8174 rt/itac/itac.tdesc,21 local testName 2,15 @@ -8550,200 +8548,200 @@ export PATH;34,1790 _LMFILES_=35,1803 export _LMFILES_;36,1858 _ModuleTable_=37,1876 -export _ModuleTable_;38,2264 -export MODULEPATH;44,2496 -_ModuleTable_=45,2515 -export _ModuleTable_;46,2903 -export MODULEPATH;52,3153 -_ModuleTable_=53,3172 -export _ModuleTable_;54,3560 -unset LD_LIBRARY_PATH;60,3756 -unset LMOD_FAMILY_COMPILER;61,3779 -unset LMOD_FAMILY_COMPILER_VERSION;62,3807 -unset LOADEDMODULES;63,3843 -unset __LMOD_REF_COUNT_MANPATH;64,3864 -unset MANPATH;65,3896 -unset MKL_DIR;66,3911 -unset MKL_INCLUDE;67,3926 -__LMOD_REF_COUNT_MODULEPATH=68,3945 -export __LMOD_REF_COUNT_MODULEPATH;69,4004 -MODULEPATH=70,4040 -export MODULEPATH;71,4080 -__LMOD_REF_COUNT_PATH=72,4099 -export __LMOD_REF_COUNT_PATH;73,4159 -PATH=74,4189 -export PATH;75,4227 -unset _LMFILES_;76,4240 -_ModuleTable_=77,4257 -export _ModuleTable_;78,4415 -export MODULEPATH;84,4604 -_ModuleTable_=85,4623 -export _ModuleTable_;86,4781 -export MODULEPATH;92,4984 -_ModuleTable_=93,5003 -export _ModuleTable_;94,5161 -export MODULEPATH;100,5353 -_ModuleTable_=101,5372 -export _ModuleTable_;102,5530 -export MODULEPATH;108,5736 -_ModuleTable_=109,5755 -export _ModuleTable_;110,5913 -export MODULEPATH;116,6109 -_ModuleTable_=117,6128 -export _ModuleTable_;118,6286 -export MODULEPATH;124,6483 -_ModuleTable_=125,6502 -export _ModuleTable_;126,6660 -export MODULEPATH;132,6860 -_ModuleTable_=133,6879 -export _ModuleTable_;134,7037 -export MODULEPATH;140,7242 -_ModuleTable_=141,7261 -export _ModuleTable_;142,7419 -export __LMOD_REF_COUNT_MODULEPATH;148,7687 -MODULEPATH=149,7723 -export MODULEPATH;150,7792 -_ModuleTable_=151,7811 -export _ModuleTable_;152,8000 -export MODULEPATH;158,8225 -_ModuleTable_=159,8244 -export _ModuleTable_;160,8433 -export MODULEPATH;166,8667 -_ModuleTable_=167,8686 -export _ModuleTable_;168,8875 -export MODULEPATH;174,9097 -_ModuleTable_=175,9116 -export _ModuleTable_;176,9305 -export MODULEPATH;182,9524 -_ModuleTable_=183,9543 -export _ModuleTable_;184,9732 -export __LMOD_REF_COUNT_MODULEPATH;195,10076 -MODULEPATH=196,10112 -export MODULEPATH;197,10153 -_ModuleTable_=198,10172 -export _ModuleTable_;199,10332 -export LOADEDMODULES;205,10506 -MODULEPATH=206,10528 -export MODULEPATH;207,10569 -Version=208,10588 -export Version;209,10602 -_LMFILES_=210,10618 -export _LMFILES_;211,10667 -_ModuleTable_=212,10685 -export _ModuleTable_;213,10993 -export LOADEDMODULES;219,11188 -MODULEPATH=220,11210 -export MODULEPATH;221,11251 -Version=222,11270 -export Version;223,11286 -_LMFILES_=224,11302 -export _LMFILES_;225,11397 -_ModuleTable_=226,11415 -export _ModuleTable_;227,11924 -export LOADEDMODULES;233,12112 -MODULEPATH=234,12134 -export MODULEPATH;235,12175 -Version=236,12194 -export Version;237,12210 -_LMFILES_=238,12226 -export _LMFILES_;239,12321 -_ModuleTable_=240,12339 -export _ModuleTable_;241,12841 -export __LMOD_REF_COUNT_MODULEPATH;247,13110 -MODULEPATH=248,13146 -export MODULEPATH;249,13216 -_ModuleTable_=250,13235 -export _ModuleTable_;251,13768 -export MODULEPATH;257,13988 -_ModuleTable_=258,14007 -export _ModuleTable_;259,14540 -export __LMOD_REF_COUNT_MODULEPATH;265,14841 -MODULEPATH=266,14877 -export MODULEPATH;267,14976 -_ModuleTable_=268,14995 -export _ModuleTable_;269,15559 -export MODULEPATH;275,15808 -_ModuleTable_=276,15827 -export _ModuleTable_;277,16391 -export __LMOD_REF_COUNT_MODULEPATH;283,16724 -MODULEPATH=284,16760 -export MODULEPATH;285,16888 -_ModuleTable_=286,16907 -export _ModuleTable_;287,17502 -export MODULEPATH;293,17780 -_ModuleTable_=294,17799 -export _ModuleTable_;295,18394 -export MODULEPATH;301,18679 -_ModuleTable_=302,18698 -export _ModuleTable_;303,19293 -MODULEPATH=309,19464 -export MODULEPATH;310,19592 -unset Version;311,19611 -unset _LMFILES_;312,19626 -_ModuleTable_=313,19643 -export _ModuleTable_;314,19896 -export __LMOD_REF_COUNT_MODULEPATH;320,20133 -MODULEPATH=321,20169 -export MODULEPATH;322,20210 -_ModuleTable_=323,20229 -export _ModuleTable_;324,20342 -export MODULEPATH;330,20533 -_ModuleTable_=331,20552 -export _ModuleTable_;332,20665 -export LOADEDMODULES;338,20837 -MODULEPATH=339,20859 -export MODULEPATH;340,20900 -_LMFILES_=341,20919 -export _LMFILES_;342,20965 -_ModuleTable_=343,20983 -export _ModuleTable_;344,21254 -export LOADEDMODULES;350,21432 -MODULEPATH=351,21454 -export MODULEPATH;352,21495 -_LMFILES_=353,21514 -export _LMFILES_;354,21599 -_ModuleTable_=355,21617 -export _ModuleTable_;356,22040 -export MODULEPATH;362,22230 -_ModuleTable_=363,22249 -export _ModuleTable_;364,22672 -export __LMOD_REF_COUNT_MODULEPATH;370,22941 -MODULEPATH=371,22977 -export MODULEPATH;372,23047 -_ModuleTable_=373,23066 -export _ModuleTable_;374,23520 -export MODULEPATH;380,23740 -_ModuleTable_=381,23759 -export _ModuleTable_;382,24213 -export __LMOD_REF_COUNT_MODULEPATH;388,24514 -MODULEPATH=389,24550 -export MODULEPATH;390,24649 -_ModuleTable_=391,24668 -export _ModuleTable_;392,25153 -MODULEPATH=398,25324 -export MODULEPATH;399,25423 -unset _LMFILES_;400,25442 -_ModuleTable_=401,25459 -export _ModuleTable_;402,25634 -export __LMOD_REF_COUNT_MODULEPATH;408,25871 -MODULEPATH=409,25907 -export MODULEPATH;410,25948 -_ModuleTable_=411,25967 -export _ModuleTable_;412,26080 -export MODULEPATH;418,26271 -_ModuleTable_=419,26290 -export _ModuleTable_;420,26403 -export MODULEPATH;426,26594 -_ModuleTable_=427,26613 -export _ModuleTable_;428,26726 -export __LMOD_REF_COUNT_MODULEPATH;434,26936 -MODULEPATH=435,26972 -export MODULEPATH;436,27013 -_ModuleTable_=437,27032 -export _ModuleTable_;438,27192 -export MODULEPATH;444,27392 -_ModuleTable_=445,27411 -export _ModuleTable_;446,27571 +export _ModuleTable_;38,2353 +export MODULEPATH;44,2585 +_ModuleTable_=45,2604 +export _ModuleTable_;46,3081 +export MODULEPATH;52,3331 +_ModuleTable_=53,3350 +export _ModuleTable_;54,3827 +unset LD_LIBRARY_PATH;60,4023 +unset LMOD_FAMILY_COMPILER;61,4046 +unset LMOD_FAMILY_COMPILER_VERSION;62,4074 +unset LOADEDMODULES;63,4110 +unset __LMOD_REF_COUNT_MANPATH;64,4131 +unset MANPATH;65,4163 +unset MKL_DIR;66,4178 +unset MKL_INCLUDE;67,4193 +__LMOD_REF_COUNT_MODULEPATH=68,4212 +export __LMOD_REF_COUNT_MODULEPATH;69,4271 +MODULEPATH=70,4307 +export MODULEPATH;71,4347 +__LMOD_REF_COUNT_PATH=72,4366 +export __LMOD_REF_COUNT_PATH;73,4426 +PATH=74,4456 +export PATH;75,4494 +unset _LMFILES_;76,4507 +_ModuleTable_=77,4524 +export _ModuleTable_;78,4682 +export MODULEPATH;84,4871 +_ModuleTable_=85,4890 +export _ModuleTable_;86,5048 +export MODULEPATH;92,5251 +_ModuleTable_=93,5270 +export _ModuleTable_;94,5428 +export MODULEPATH;100,5620 +_ModuleTable_=101,5639 +export _ModuleTable_;102,5797 +export MODULEPATH;108,6003 +_ModuleTable_=109,6022 +export _ModuleTable_;110,6180 +export MODULEPATH;116,6376 +_ModuleTable_=117,6395 +export _ModuleTable_;118,6553 +export MODULEPATH;124,6750 +_ModuleTable_=125,6769 +export _ModuleTable_;126,6927 +export MODULEPATH;132,7127 +_ModuleTable_=133,7146 +export _ModuleTable_;134,7304 +export MODULEPATH;140,7509 +_ModuleTable_=141,7528 +export _ModuleTable_;142,7686 +export __LMOD_REF_COUNT_MODULEPATH;148,7954 +MODULEPATH=149,7990 +export MODULEPATH;150,8059 +_ModuleTable_=151,8078 +export _ModuleTable_;152,8267 +export MODULEPATH;158,8492 +_ModuleTable_=159,8511 +export _ModuleTable_;160,8700 +export MODULEPATH;166,8934 +_ModuleTable_=167,8953 +export _ModuleTable_;168,9142 +export MODULEPATH;174,9364 +_ModuleTable_=175,9383 +export _ModuleTable_;176,9572 +export MODULEPATH;182,9791 +_ModuleTable_=183,9810 +export _ModuleTable_;184,9999 +export __LMOD_REF_COUNT_MODULEPATH;195,10343 +MODULEPATH=196,10379 +export MODULEPATH;197,10420 +_ModuleTable_=198,10439 +export _ModuleTable_;199,10599 +export LOADEDMODULES;205,10773 +MODULEPATH=206,10795 +export MODULEPATH;207,10836 +Version=208,10855 +export Version;209,10869 +_LMFILES_=210,10885 +export _LMFILES_;211,10934 +_ModuleTable_=212,10952 +export _ModuleTable_;213,11260 +export LOADEDMODULES;219,11455 +MODULEPATH=220,11477 +export MODULEPATH;221,11518 +Version=222,11537 +export Version;223,11553 +_LMFILES_=224,11569 +export _LMFILES_;225,11664 +_ModuleTable_=226,11682 +export _ModuleTable_;227,12191 +export LOADEDMODULES;233,12379 +MODULEPATH=234,12401 +export MODULEPATH;235,12442 +Version=236,12461 +export Version;237,12477 +_LMFILES_=238,12493 +export _LMFILES_;239,12588 +_ModuleTable_=240,12606 +export _ModuleTable_;241,13108 +export __LMOD_REF_COUNT_MODULEPATH;247,13377 +MODULEPATH=248,13413 +export MODULEPATH;249,13483 +_ModuleTable_=250,13502 +export _ModuleTable_;251,14035 +export MODULEPATH;257,14255 +_ModuleTable_=258,14274 +export _ModuleTable_;259,14807 +export __LMOD_REF_COUNT_MODULEPATH;265,15108 +MODULEPATH=266,15144 +export MODULEPATH;267,15243 +_ModuleTable_=268,15262 +export _ModuleTable_;269,15826 +export MODULEPATH;275,16075 +_ModuleTable_=276,16094 +export _ModuleTable_;277,16658 +export __LMOD_REF_COUNT_MODULEPATH;283,16991 +MODULEPATH=284,17027 +export MODULEPATH;285,17155 +_ModuleTable_=286,17174 +export _ModuleTable_;287,17769 +export MODULEPATH;293,18047 +_ModuleTable_=294,18066 +export _ModuleTable_;295,18661 +export MODULEPATH;301,18946 +_ModuleTable_=302,18965 +export _ModuleTable_;303,19560 +MODULEPATH=309,19731 +export MODULEPATH;310,19859 +unset Version;311,19878 +unset _LMFILES_;312,19893 +_ModuleTable_=313,19910 +export _ModuleTable_;314,20163 +export __LMOD_REF_COUNT_MODULEPATH;320,20400 +MODULEPATH=321,20436 +export MODULEPATH;322,20477 +_ModuleTable_=323,20496 +export _ModuleTable_;324,20609 +export MODULEPATH;330,20800 +_ModuleTable_=331,20819 +export _ModuleTable_;332,20932 +export LOADEDMODULES;338,21104 +MODULEPATH=339,21126 +export MODULEPATH;340,21167 +_LMFILES_=341,21186 +export _LMFILES_;342,21232 +_ModuleTable_=343,21250 +export _ModuleTable_;344,21521 +export LOADEDMODULES;350,21699 +MODULEPATH=351,21721 +export MODULEPATH;352,21762 +_LMFILES_=353,21781 +export _LMFILES_;354,21866 +_ModuleTable_=355,21884 +export _ModuleTable_;356,22307 +export MODULEPATH;362,22497 +_ModuleTable_=363,22516 +export _ModuleTable_;364,22939 +export __LMOD_REF_COUNT_MODULEPATH;370,23208 +MODULEPATH=371,23244 +export MODULEPATH;372,23314 +_ModuleTable_=373,23333 +export _ModuleTable_;374,23787 +export MODULEPATH;380,24007 +_ModuleTable_=381,24026 +export _ModuleTable_;382,24480 +export __LMOD_REF_COUNT_MODULEPATH;388,24781 +MODULEPATH=389,24817 +export MODULEPATH;390,24916 +_ModuleTable_=391,24935 +export _ModuleTable_;392,25420 +MODULEPATH=398,25591 +export MODULEPATH;399,25690 +unset _LMFILES_;400,25709 +_ModuleTable_=401,25726 +export _ModuleTable_;402,25901 +export __LMOD_REF_COUNT_MODULEPATH;408,26138 +MODULEPATH=409,26174 +export MODULEPATH;410,26215 +_ModuleTable_=411,26234 +export _ModuleTable_;412,26347 +export MODULEPATH;418,26538 +_ModuleTable_=419,26557 +export _ModuleTable_;420,26670 +export MODULEPATH;426,26861 +_ModuleTable_=427,26880 +export _ModuleTable_;428,26993 +export __LMOD_REF_COUNT_MODULEPATH;434,27203 +MODULEPATH=435,27239 +export MODULEPATH;436,27280 +_ModuleTable_=437,27299 +export _ModuleTable_;438,27459 +export MODULEPATH;444,27659 +_ModuleTable_=445,27678 +export _ModuleTable_;446,27838 rt/avail/avail.tdesc,19 testdescript 2,15 @@ -8784,13 +8782,13 @@ export MODULEPATH;78,4056 _LMFILES_=79,4075 export _LMFILES_;80,4161 _ModuleTable_=81,4179 -export _ModuleTable_;82,4685 -export MODULEPATH;88,4977 -_ModuleTable_=89,4996 -export _ModuleTable_;90,5502 +export _ModuleTable_;82,4807 +export MODULEPATH;88,5099 +_ModuleTable_=89,5118 +export _ModuleTable_;90,5746 rt/inaccessible/err.txt,97 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule49,2046 +Also make sure that all modulefiles written in TCL start with the string #%ModuleModule49,2045 rt/nvv/nvv.tdesc,21 local testName 2,15 @@ -8857,7 +8855,7 @@ export _ModuleTable_;116,6400 rt/sticky/sticky.tdesc,21 local testName=2,15 -rt/sticky/out.txt,9723 +rt/sticky/out.txt,9727 export A;10,271 LOADEDMODULES=11,281 export LOADEDMODULES;12,304 @@ -8888,323 +8886,323 @@ export MODULEPATH;56,3052 _LMFILES_=57,3071 export _LMFILES_;58,3222 _ModuleTable_=59,3240 -export _ModuleTable_;60,4036 -export MODULEPATH;66,4266 -_ModuleTable_=67,4285 -export _ModuleTable_;68,5081 -export A;74,5240 -LOADEDMODULES=75,5250 -export LOADEDMODULES;76,5273 -__LMOD_REF_COUNT_MODULEPATH=77,5295 -export __LMOD_REF_COUNT_MODULEPATH;78,5355 -MODULEPATH=79,5391 -export MODULEPATH;80,5432 -_LMFILES_=81,5451 -export _LMFILES_;82,5503 -_ModuleTable_=83,5521 -export _ModuleTable_;84,5872 -unset LOADEDMODULES;90,6038 -MODULEPATH=91,6059 -export MODULEPATH;92,6100 -unset _LMFILES_;93,6119 -_ModuleTable_=94,6136 -export _ModuleTable_;95,6296 -export MODULEPATH;101,6486 -_ModuleTable_=102,6505 -export _ModuleTable_;103,6665 -export A;109,6828 -LOADEDMODULES=110,6838 -export LOADEDMODULES;111,6861 -MODULEPATH=112,6883 -export MODULEPATH;113,6924 -_LMFILES_=114,6943 -export _LMFILES_;115,6995 -_ModuleTable_=116,7013 -export _ModuleTable_;117,7364 -export A;123,7525 -MODULEPATH=124,7535 -export MODULEPATH;125,7576 -_ModuleTable_=126,7595 -export _ModuleTable_;127,7946 -export MODULEPATH;133,8136 -_ModuleTable_=134,8155 -export _ModuleTable_;135,8506 -export A;141,8670 -MODULEPATH=142,8680 -export MODULEPATH;143,8721 -_ModuleTable_=144,8740 -export _ModuleTable_;145,9091 -export MODULEPATH;151,9281 -_ModuleTable_=152,9300 -export _ModuleTable_;153,9651 -unset LOADEDMODULES;159,9819 -MODULEPATH=160,9840 -export MODULEPATH;161,9881 -unset _LMFILES_;162,9900 -_ModuleTable_=163,9917 -export _ModuleTable_;164,10077 -export MODULEPATH;170,10267 -_ModuleTable_=171,10286 -export _ModuleTable_;172,10446 -export A_VERSION;178,10617 -B_VERSION=179,10635 -export B_VERSION;180,10650 -LOADEDMODULES=181,10668 -export LOADEDMODULES;182,10702 -MODULEPATH=183,10724 -export MODULEPATH;184,10765 -_LMFILES_=185,10784 -export _LMFILES_;186,10913 -_ModuleTable_=187,10931 -export _ModuleTable_;188,11578 -export MODULEPATH;194,11768 -_ModuleTable_=195,11787 -export _ModuleTable_;196,12434 -export A_VERSION;202,12605 -B_VERSION=203,12623 -export B_VERSION;204,12638 -MODULEPATH=205,12656 -export MODULEPATH;206,12697 -_ModuleTable_=207,12716 -export _ModuleTable_;208,13363 -export MODULEPATH;214,13553 -_ModuleTable_=215,13572 -export _ModuleTable_;216,14219 -unset B_VERSION;222,14391 -LOADEDMODULES=223,14408 -export LOADEDMODULES;224,14430 -MODULEPATH=225,14452 -export MODULEPATH;226,14493 -_LMFILES_=227,14512 -export _LMFILES_;228,14563 -_ModuleTable_=229,14581 -export _ModuleTable_;230,14914 -export MODULEPATH;236,15104 -_ModuleTable_=237,15123 -export _ModuleTable_;238,15456 -export A_VERSION;244,15621 -B_VERSION=245,15639 -export B_VERSION;246,15654 -LOADEDMODULES=247,15672 -export LOADEDMODULES;248,15706 -MODULEPATH=249,15728 -export MODULEPATH;250,15769 -_LMFILES_=251,15788 -export _LMFILES_;252,15917 -_ModuleTable_=253,15935 -export _ModuleTable_;254,16582 -export MODULEPATH;260,16772 -_ModuleTable_=261,16791 -export _ModuleTable_;262,17438 -export MODULEPATH;268,17628 -_ModuleTable_=269,17647 -export _ModuleTable_;270,18294 -unset B_VERSION;276,18469 -unset LOADEDMODULES;277,18486 -MODULEPATH=278,18507 -export MODULEPATH;279,18548 -unset _LMFILES_;280,18567 -_ModuleTable_=281,18584 -export _ModuleTable_;282,18744 -export A_VERSION;288,18911 -B_VERSION=289,18929 -export B_VERSION;290,18944 -LOADEDMODULES=291,18962 -export LOADEDMODULES;292,18996 -MODULEPATH=293,19018 -export MODULEPATH;294,19059 -_LMFILES_=295,19078 -export _LMFILES_;296,19207 -_ModuleTable_=297,19225 -export _ModuleTable_;298,19872 -__LMOD_DEFAULT_MODULES_LOADED__=299,19894 -export __LMOD_DEFAULT_MODULES_LOADED__;300,19929 -export MODULEPATH;306,20137 -_ModuleTable_=307,20156 -export _ModuleTable_;308,20803 -export A_VERSION;314,20970 -B_VERSION=315,20988 -export B_VERSION;316,21003 -MODULEPATH=317,21021 -export MODULEPATH;318,21062 -_ModuleTable_=319,21081 -export _ModuleTable_;320,21728 -__LMOD_DEFAULT_MODULES_LOADED__=321,21750 -export __LMOD_DEFAULT_MODULES_LOADED__;322,21785 -export MODULEPATH;328,21993 -_ModuleTable_=329,22012 -export _ModuleTable_;330,22659 -unset B_VERSION;336,22834 -unset LOADEDMODULES;337,22851 -MODULEPATH=338,22872 -export MODULEPATH;339,22913 -unset _LMFILES_;340,22932 -_ModuleTable_=341,22949 -export _ModuleTable_;342,23109 -export C_VERSION;348,23276 -D_VERSION=349,23294 -export D_VERSION;350,23309 -LOADEDMODULES=351,23327 -export LOADEDMODULES;352,23357 -__LMOD_REF_COUNT_MODULEPATH=353,23379 -export __LMOD_REF_COUNT_MODULEPATH;354,23473 -MODULEPATH=355,23509 -export MODULEPATH;356,23581 -_LMFILES_=357,23600 -export _LMFILES_;358,23729 -_ModuleTable_=359,23747 -export _ModuleTable_;360,24428 -export MODULEPATH;366,24649 -_ModuleTable_=367,24668 -export _ModuleTable_;368,25349 -export MODULEPATH;374,25570 -_ModuleTable_=375,25589 -export _ModuleTable_;376,26270 -export C_VERSION;382,26437 -D_VERSION=383,26455 -export D_VERSION;384,26470 -MODULEPATH=385,26488 -export MODULEPATH;386,26560 -_ModuleTable_=387,26579 -export _ModuleTable_;388,27260 -__LMOD_DEFAULT_MODULES_LOADED__=389,27282 -export __LMOD_DEFAULT_MODULES_LOADED__;390,27317 -export MODULEPATH;396,27556 -_ModuleTable_=397,27575 -export _ModuleTable_;398,28256 -unset D_VERSION;404,28431 -unset LOADEDMODULES;405,28448 -__LMOD_REF_COUNT_MODULEPATH=406,28469 -export __LMOD_REF_COUNT_MODULEPATH;407,28529 -MODULEPATH=408,28565 -export MODULEPATH;409,28606 -unset _LMFILES_;410,28625 -_ModuleTable_=411,28642 -export _ModuleTable_;412,28802 -export C_VERSION;418,28973 -D_VERSION=419,28991 -export D_VERSION;420,29006 -LOADEDMODULES=421,29024 -export LOADEDMODULES;422,29054 -__LMOD_REF_COUNT_MODULEPATH=423,29076 -export __LMOD_REF_COUNT_MODULEPATH;424,29170 -MODULEPATH=425,29206 -export MODULEPATH;426,29278 -_LMFILES_=427,29297 -export _LMFILES_;428,29426 -_ModuleTable_=429,29444 -export _ModuleTable_;430,30125 -export MODULEPATH;436,30346 -_ModuleTable_=437,30365 -export _ModuleTable_;438,31046 -export MODULEPATH;444,31267 -_ModuleTable_=445,31286 -export _ModuleTable_;446,31967 -export C_VERSION;452,32134 -D_VERSION=453,32152 -export D_VERSION;454,32167 -MODULEPATH=455,32185 -export MODULEPATH;456,32257 -_ModuleTable_=457,32276 -export _ModuleTable_;458,32957 -__LMOD_DEFAULT_MODULES_LOADED__=459,32979 -export __LMOD_DEFAULT_MODULES_LOADED__;460,33014 -export MODULEPATH;466,33253 -_ModuleTable_=467,33272 -export _ModuleTable_;468,33953 -unset D_VERSION;474,34128 -unset LOADEDMODULES;475,34145 -__LMOD_REF_COUNT_MODULEPATH=476,34166 -export __LMOD_REF_COUNT_MODULEPATH;477,34226 -MODULEPATH=478,34262 -export MODULEPATH;479,34303 -unset _LMFILES_;480,34322 -_ModuleTable_=481,34339 -export _ModuleTable_;482,34499 -export A_VERSION;488,34664 -B_VERSION=489,34682 -export B_VERSION;490,34697 -LOADEDMODULES=491,34715 -export LOADEDMODULES;492,34749 -MODULEPATH=493,34771 -export MODULEPATH;494,34812 -_LMFILES_=495,34831 -export _LMFILES_;496,34960 -_ModuleTable_=497,34978 -export _ModuleTable_;498,35625 -export A_VERSION;504,35790 -B_VERSION=505,35808 -export B_VERSION;506,35823 -MODULEPATH=507,35841 -export MODULEPATH;508,35882 -_ModuleTable_=509,35901 -export _ModuleTable_;510,36548 -export LMOD_FAMILY_BASE;516,36723 -LMOD_FAMILY_BASE_VERSION=517,36748 -export LMOD_FAMILY_BASE_VERSION;518,36780 -LOADEDMODULES=519,36813 -export LOADEDMODULES;520,36851 -MODULEPATH=521,36873 -export MODULEPATH;522,36914 -NAME=523,36933 -export NAME;524,36943 -_LMFILES_=525,36956 -export _LMFILES_;526,37122 -_ModuleTable_=527,37140 -export _ModuleTable_;528,37959 -export LMOD_FAMILY_BASE;534,38138 -LMOD_FAMILY_BASE_VERSION=535,38163 -export LMOD_FAMILY_BASE_VERSION;536,38195 -LOADEDMODULES=537,38228 -export LOADEDMODULES;538,38266 -MODULEPATH=539,38288 -export MODULEPATH;540,38329 -NAME=541,38348 -export NAME;542,38358 -_LMFILES_=543,38371 -export _LMFILES_;544,38537 -_ModuleTable_=545,38555 -export _ModuleTable_;546,39374 -export MODULEPATH;552,39564 -_ModuleTable_=553,39583 -export _ModuleTable_;554,40402 -export LMOD_FAMILY_BASE;560,40577 -LMOD_FAMILY_BASE_VERSION=561,40602 -export LMOD_FAMILY_BASE_VERSION;562,40634 -LOADEDMODULES=563,40667 -export LOADEDMODULES;564,40705 -MODULEPATH=565,40727 -export MODULEPATH;566,40768 -NAME=567,40787 -export NAME;568,40797 -_LMFILES_=569,40810 -export _LMFILES_;570,40976 -_ModuleTable_=571,40994 -export _ModuleTable_;572,41813 -export MODULEPATH;578,42003 -_ModuleTable_=579,42022 -export _ModuleTable_;580,42841 -export MODULEPATH;586,43032 -_ModuleTable_=587,43051 -export _ModuleTable_;588,43870 -export LOADEDMODULES;594,44064 -__LMOD_REF_COUNT_MODULEPATH=595,44086 -export __LMOD_REF_COUNT_MODULEPATH;596,44180 -MODULEPATH=597,44216 -export MODULEPATH;598,44288 -_LMFILES_=599,44307 -export _LMFILES_;600,44405 -_ModuleTable_=601,44423 -export _ModuleTable_;602,44985 -export MODULEPATH;608,45206 -_ModuleTable_=609,45225 -export _ModuleTable_;610,45787 -export MODULEPATH;616,46009 -_ModuleTable_=617,46028 -export _ModuleTable_;618,46590 -export MODULEPATH;624,46811 -_ModuleTable_=625,46830 -export _ModuleTable_;626,47392 +export _ModuleTable_;60,4123 +export MODULEPATH;66,4353 +_ModuleTable_=67,4372 +export _ModuleTable_;68,5255 +export A;74,5414 +LOADEDMODULES=75,5424 +export LOADEDMODULES;76,5447 +__LMOD_REF_COUNT_MODULEPATH=77,5469 +export __LMOD_REF_COUNT_MODULEPATH;78,5529 +MODULEPATH=79,5565 +export MODULEPATH;80,5606 +_LMFILES_=81,5625 +export _LMFILES_;82,5677 +_ModuleTable_=83,5695 +export _ModuleTable_;84,6046 +unset LOADEDMODULES;90,6212 +MODULEPATH=91,6233 +export MODULEPATH;92,6274 +unset _LMFILES_;93,6293 +_ModuleTable_=94,6310 +export _ModuleTable_;95,6470 +export MODULEPATH;101,6660 +_ModuleTable_=102,6679 +export _ModuleTable_;103,6839 +export A;109,7002 +LOADEDMODULES=110,7012 +export LOADEDMODULES;111,7035 +MODULEPATH=112,7057 +export MODULEPATH;113,7098 +_LMFILES_=114,7117 +export _LMFILES_;115,7169 +_ModuleTable_=116,7187 +export _ModuleTable_;117,7538 +export A;123,7699 +MODULEPATH=124,7709 +export MODULEPATH;125,7750 +_ModuleTable_=126,7769 +export _ModuleTable_;127,8120 +export MODULEPATH;133,8310 +_ModuleTable_=134,8329 +export _ModuleTable_;135,8680 +export A;141,8844 +MODULEPATH=142,8854 +export MODULEPATH;143,8895 +_ModuleTable_=144,8914 +export _ModuleTable_;145,9265 +export MODULEPATH;151,9455 +_ModuleTable_=152,9474 +export _ModuleTable_;153,9825 +unset LOADEDMODULES;159,9993 +MODULEPATH=160,10014 +export MODULEPATH;161,10055 +unset _LMFILES_;162,10074 +_ModuleTable_=163,10091 +export _ModuleTable_;164,10251 +export MODULEPATH;170,10441 +_ModuleTable_=171,10460 +export _ModuleTable_;172,10620 +export A_VERSION;178,10791 +B_VERSION=179,10809 +export B_VERSION;180,10824 +LOADEDMODULES=181,10842 +export LOADEDMODULES;182,10876 +MODULEPATH=183,10898 +export MODULEPATH;184,10939 +_LMFILES_=185,10958 +export _LMFILES_;186,11087 +_ModuleTable_=187,11105 +export _ModuleTable_;188,11752 +export MODULEPATH;194,11942 +_ModuleTable_=195,11961 +export _ModuleTable_;196,12608 +export A_VERSION;202,12779 +B_VERSION=203,12797 +export B_VERSION;204,12812 +MODULEPATH=205,12830 +export MODULEPATH;206,12871 +_ModuleTable_=207,12890 +export _ModuleTable_;208,13537 +export MODULEPATH;214,13727 +_ModuleTable_=215,13746 +export _ModuleTable_;216,14393 +unset B_VERSION;222,14565 +LOADEDMODULES=223,14582 +export LOADEDMODULES;224,14604 +MODULEPATH=225,14626 +export MODULEPATH;226,14667 +_LMFILES_=227,14686 +export _LMFILES_;228,14737 +_ModuleTable_=229,14755 +export _ModuleTable_;230,15088 +export MODULEPATH;236,15278 +_ModuleTable_=237,15297 +export _ModuleTable_;238,15630 +export A_VERSION;244,15795 +B_VERSION=245,15813 +export B_VERSION;246,15828 +LOADEDMODULES=247,15846 +export LOADEDMODULES;248,15880 +MODULEPATH=249,15902 +export MODULEPATH;250,15943 +_LMFILES_=251,15962 +export _LMFILES_;252,16091 +_ModuleTable_=253,16109 +export _ModuleTable_;254,16756 +export MODULEPATH;260,16946 +_ModuleTable_=261,16965 +export _ModuleTable_;262,17612 +export MODULEPATH;268,17802 +_ModuleTable_=269,17821 +export _ModuleTable_;270,18468 +unset B_VERSION;276,18643 +unset LOADEDMODULES;277,18660 +MODULEPATH=278,18681 +export MODULEPATH;279,18722 +unset _LMFILES_;280,18741 +_ModuleTable_=281,18758 +export _ModuleTable_;282,18918 +export A_VERSION;288,19085 +B_VERSION=289,19103 +export B_VERSION;290,19118 +LOADEDMODULES=291,19136 +export LOADEDMODULES;292,19170 +MODULEPATH=293,19192 +export MODULEPATH;294,19233 +_LMFILES_=295,19252 +export _LMFILES_;296,19381 +_ModuleTable_=297,19399 +export _ModuleTable_;298,20046 +__LMOD_DEFAULT_MODULES_LOADED__=299,20068 +export __LMOD_DEFAULT_MODULES_LOADED__;300,20103 +export MODULEPATH;306,20311 +_ModuleTable_=307,20330 +export _ModuleTable_;308,20977 +export A_VERSION;314,21144 +B_VERSION=315,21162 +export B_VERSION;316,21177 +MODULEPATH=317,21195 +export MODULEPATH;318,21236 +_ModuleTable_=319,21255 +export _ModuleTable_;320,21902 +__LMOD_DEFAULT_MODULES_LOADED__=321,21924 +export __LMOD_DEFAULT_MODULES_LOADED__;322,21959 +export MODULEPATH;328,22167 +_ModuleTable_=329,22186 +export _ModuleTable_;330,22833 +unset B_VERSION;336,23008 +unset LOADEDMODULES;337,23025 +MODULEPATH=338,23046 +export MODULEPATH;339,23087 +unset _LMFILES_;340,23106 +_ModuleTable_=341,23123 +export _ModuleTable_;342,23283 +export C_VERSION;348,23450 +D_VERSION=349,23468 +export D_VERSION;350,23483 +LOADEDMODULES=351,23501 +export LOADEDMODULES;352,23531 +__LMOD_REF_COUNT_MODULEPATH=353,23553 +export __LMOD_REF_COUNT_MODULEPATH;354,23647 +MODULEPATH=355,23683 +export MODULEPATH;356,23755 +_LMFILES_=357,23774 +export _LMFILES_;358,23903 +_ModuleTable_=359,23921 +export _ModuleTable_;360,24679 +export MODULEPATH;366,24900 +_ModuleTable_=367,24919 +export _ModuleTable_;368,25677 +export MODULEPATH;374,25898 +_ModuleTable_=375,25917 +export _ModuleTable_;376,26675 +export C_VERSION;382,26842 +D_VERSION=383,26860 +export D_VERSION;384,26875 +MODULEPATH=385,26893 +export MODULEPATH;386,26965 +_ModuleTable_=387,26984 +export _ModuleTable_;388,27742 +__LMOD_DEFAULT_MODULES_LOADED__=389,27764 +export __LMOD_DEFAULT_MODULES_LOADED__;390,27799 +export MODULEPATH;396,28038 +_ModuleTable_=397,28057 +export _ModuleTable_;398,28815 +unset D_VERSION;404,28990 +unset LOADEDMODULES;405,29007 +__LMOD_REF_COUNT_MODULEPATH=406,29028 +export __LMOD_REF_COUNT_MODULEPATH;407,29088 +MODULEPATH=408,29124 +export MODULEPATH;409,29165 +unset _LMFILES_;410,29184 +_ModuleTable_=411,29201 +export _ModuleTable_;412,29361 +export C_VERSION;418,29532 +D_VERSION=419,29550 +export D_VERSION;420,29565 +LOADEDMODULES=421,29583 +export LOADEDMODULES;422,29613 +__LMOD_REF_COUNT_MODULEPATH=423,29635 +export __LMOD_REF_COUNT_MODULEPATH;424,29729 +MODULEPATH=425,29765 +export MODULEPATH;426,29837 +_LMFILES_=427,29856 +export _LMFILES_;428,29985 +_ModuleTable_=429,30003 +export _ModuleTable_;430,30761 +export MODULEPATH;436,30982 +_ModuleTable_=437,31001 +export _ModuleTable_;438,31759 +export MODULEPATH;444,31980 +_ModuleTable_=445,31999 +export _ModuleTable_;446,32757 +export C_VERSION;452,32924 +D_VERSION=453,32942 +export D_VERSION;454,32957 +MODULEPATH=455,32975 +export MODULEPATH;456,33047 +_ModuleTable_=457,33066 +export _ModuleTable_;458,33824 +__LMOD_DEFAULT_MODULES_LOADED__=459,33846 +export __LMOD_DEFAULT_MODULES_LOADED__;460,33881 +export MODULEPATH;466,34120 +_ModuleTable_=467,34139 +export _ModuleTable_;468,34897 +unset D_VERSION;474,35072 +unset LOADEDMODULES;475,35089 +__LMOD_REF_COUNT_MODULEPATH=476,35110 +export __LMOD_REF_COUNT_MODULEPATH;477,35170 +MODULEPATH=478,35206 +export MODULEPATH;479,35247 +unset _LMFILES_;480,35266 +_ModuleTable_=481,35283 +export _ModuleTable_;482,35443 +export A_VERSION;488,35608 +B_VERSION=489,35626 +export B_VERSION;490,35641 +LOADEDMODULES=491,35659 +export LOADEDMODULES;492,35693 +MODULEPATH=493,35715 +export MODULEPATH;494,35756 +_LMFILES_=495,35775 +export _LMFILES_;496,35904 +_ModuleTable_=497,35922 +export _ModuleTable_;498,36569 +export A_VERSION;504,36734 +B_VERSION=505,36752 +export B_VERSION;506,36767 +MODULEPATH=507,36785 +export MODULEPATH;508,36826 +_ModuleTable_=509,36845 +export _ModuleTable_;510,37492 +export LMOD_FAMILY_BASE;516,37667 +LMOD_FAMILY_BASE_VERSION=517,37692 +export LMOD_FAMILY_BASE_VERSION;518,37724 +LOADEDMODULES=519,37757 +export LOADEDMODULES;520,37795 +MODULEPATH=521,37817 +export MODULEPATH;522,37858 +NAME=523,37877 +export NAME;524,37887 +_LMFILES_=525,37900 +export _LMFILES_;526,38066 +_ModuleTable_=527,38084 +export _ModuleTable_;528,38903 +export LMOD_FAMILY_BASE;534,39082 +LMOD_FAMILY_BASE_VERSION=535,39107 +export LMOD_FAMILY_BASE_VERSION;536,39139 +LOADEDMODULES=537,39172 +export LOADEDMODULES;538,39210 +MODULEPATH=539,39232 +export MODULEPATH;540,39273 +NAME=541,39292 +export NAME;542,39302 +_LMFILES_=543,39315 +export _LMFILES_;544,39481 +_ModuleTable_=545,39499 +export _ModuleTable_;546,40318 +export MODULEPATH;552,40508 +_ModuleTable_=553,40527 +export _ModuleTable_;554,41346 +export LMOD_FAMILY_BASE;560,41521 +LMOD_FAMILY_BASE_VERSION=561,41546 +export LMOD_FAMILY_BASE_VERSION;562,41578 +LOADEDMODULES=563,41611 +export LOADEDMODULES;564,41649 +MODULEPATH=565,41671 +export MODULEPATH;566,41712 +NAME=567,41731 +export NAME;568,41741 +_LMFILES_=569,41754 +export _LMFILES_;570,41920 +_ModuleTable_=571,41938 +export _ModuleTable_;572,42757 +export MODULEPATH;578,42947 +_ModuleTable_=579,42966 +export _ModuleTable_;580,43785 +export MODULEPATH;586,43976 +_ModuleTable_=587,43995 +export _ModuleTable_;588,44814 +export LOADEDMODULES;594,45008 +__LMOD_REF_COUNT_MODULEPATH=595,45030 +export __LMOD_REF_COUNT_MODULEPATH;596,45124 +MODULEPATH=597,45160 +export MODULEPATH;598,45232 +_LMFILES_=599,45251 +export _LMFILES_;600,45349 +_ModuleTable_=601,45367 +export _ModuleTable_;602,46005 +export MODULEPATH;608,46226 +_ModuleTable_=609,46245 +export _ModuleTable_;610,46883 +export MODULEPATH;616,47105 +_ModuleTable_=617,47124 +export _ModuleTable_;618,47762 +export MODULEPATH;624,47983 +_ModuleTable_=625,48002 +export _ModuleTable_;626,48640 rt/boegel/mf/Compiler/GCC/4.8.2/system/hwloc/1.8.1,23 proc ModulesHelp 3,10 @@ -9420,250 +9418,376 @@ local testName 2,15 rt/depends_on_any/depends_on_any.tdesc,21 local testName 2,15 -rt/depends_on_any/out.txt,6674 -export __LMOD_REF_COUNT_MODULEPATH;19,588 -MODULEPATH=20,624 -export MODULEPATH;21,674 -_ModuleTable_=22,693 -export _ModuleTable_;23,871 -export MODULEPATH;47,1589 -_ModuleTable_=48,1608 -export _ModuleTable_;49,1786 -export MODULEPATH;69,2382 -_ModuleTable_=70,2401 -export _ModuleTable_;71,2579 -export MODULEPATH;86,3040 -_ModuleTable_=87,3059 -export _ModuleTable_;88,3237 -export MODULEPATH;98,3563 -_ModuleTable_=99,3582 -export _ModuleTable_;100,3760 -export MODULEPATH;129,4633 -_ModuleTable_=130,4652 -export _ModuleTable_;131,4830 -export MODULEPATH;146,5293 -_ModuleTable_=147,5312 -export _ModuleTable_;148,5490 -export MODULEPATH;154,5690 -_ModuleTable_=155,5709 -export _ModuleTable_;156,5887 -export MODULEPATH;181,6632 -_ModuleTable_=182,6651 -export _ModuleTable_;183,6829 -export LMOD_FAMILY_COMPILER;189,7030 -LMOD_FAMILY_COMPILER_VERSION=190,7059 -export LMOD_FAMILY_COMPILER_VERSION;191,7093 -LOADEDMODULES=192,7130 -export LOADEDMODULES;193,7187 -__LMOD_REF_COUNT_MODULEPATH=194,7209 -export __LMOD_REF_COUNT_MODULEPATH;195,7325 -MODULEPATH=196,7361 -export MODULEPATH;197,7455 -_LMFILES_=198,7474 -export _LMFILES_;199,7665 -_ModuleTable_=200,7683 -export _ModuleTable_;201,8564 -export LOADEDMODULES;207,8749 -MODULEPATH=208,8771 -export MODULEPATH;209,8865 -_LMFILES_=210,8884 -export _LMFILES_;211,8952 -_ModuleTable_=212,8970 -export _ModuleTable_;213,9413 -export LOADEDMODULES;219,9627 -MODULEPATH=220,9649 -export MODULEPATH;221,9743 -_LMFILES_=222,9762 -export _LMFILES_;223,9953 -_ModuleTable_=224,9971 -export _ModuleTable_;225,10852 -export LMOD_FAMILY_COMPILER;231,11045 -LMOD_FAMILY_COMPILER_VERSION=232,11074 -export LMOD_FAMILY_COMPILER_VERSION;233,11108 -LOADEDMODULES=234,11145 -export LOADEDMODULES;235,11202 -__LMOD_REF_COUNT_MODULEPATH=236,11224 -export __LMOD_REF_COUNT_MODULEPATH;237,11340 -MODULEPATH=238,11376 -export MODULEPATH;239,11470 -_LMFILES_=240,11489 -export _LMFILES_;241,11680 -_ModuleTable_=242,11698 -export _ModuleTable_;243,12579 -export LOADEDMODULES;249,12764 -MODULEPATH=250,12786 -export MODULEPATH;251,12880 -_LMFILES_=252,12899 -export _LMFILES_;253,12967 -_ModuleTable_=254,12985 -export _ModuleTable_;255,13428 -export MODULEPATH;261,13671 -_ModuleTable_=262,13690 -export _ModuleTable_;263,14133 -unset LMOD_FAMILY_COMPILER_VERSION;269,14311 -unset LOADEDMODULES;270,14347 -__LMOD_REF_COUNT_MODULEPATH=271,14368 -export __LMOD_REF_COUNT_MODULEPATH;272,14437 -MODULEPATH=273,14473 -export MODULEPATH;274,14523 -unset _LMFILES_;275,14542 -_ModuleTable_=276,14559 -export _ModuleTable_;277,14737 -export LMOD_FAMILY_COMPILER;283,14943 -LMOD_FAMILY_COMPILER_VERSION=284,14972 -export LMOD_FAMILY_COMPILER_VERSION;285,15006 -LOADEDMODULES=286,15043 -export LOADEDMODULES;287,15109 -__LMOD_REF_COUNT_MODULEPATH=288,15131 -export __LMOD_REF_COUNT_MODULEPATH;289,15247 -MODULEPATH=290,15283 -export MODULEPATH;291,15377 -_LMFILES_=292,15396 -export _LMFILES_;293,15644 -_ModuleTable_=294,15662 -export _ModuleTable_;295,16722 -unset LMOD_FAMILY_COMPILER_VERSION;301,16912 -unset LOADEDMODULES;302,16948 -__LMOD_REF_COUNT_MODULEPATH=303,16969 -export __LMOD_REF_COUNT_MODULEPATH;304,17038 -MODULEPATH=305,17074 -export MODULEPATH;306,17124 -unset _LMFILES_;307,17143 -_ModuleTable_=308,17160 -export _ModuleTable_;309,17932 -export LMOD_FAMILY_COMPILER;315,18125 -LMOD_FAMILY_COMPILER_VERSION=316,18154 -export LMOD_FAMILY_COMPILER_VERSION;317,18188 -LOADEDMODULES=318,18225 -export LOADEDMODULES;319,18291 -__LMOD_REF_COUNT_MODULEPATH=320,18313 -export __LMOD_REF_COUNT_MODULEPATH;321,18429 -MODULEPATH=322,18465 -export MODULEPATH;323,18559 -_LMFILES_=324,18578 -export _LMFILES_;325,18826 -_ModuleTable_=326,18844 -export _ModuleTable_;327,19936 -export MODULEPATH;333,20179 -_ModuleTable_=334,20198 -export _ModuleTable_;335,21290 -export LOADEDMODULES;341,21499 -MODULEPATH=342,21521 -export MODULEPATH;343,21615 -_LMFILES_=344,21634 -export _LMFILES_;345,21822 -_ModuleTable_=346,21840 -export _ModuleTable_;347,22709 -export MODULEPATH;353,22952 -_ModuleTable_=354,22971 -export _ModuleTable_;355,23840 -export LOADEDMODULES;361,24022 -MODULEPATH=362,24044 -export MODULEPATH;363,24138 -_LMFILES_=364,24157 -export _LMFILES_;365,24225 -_ModuleTable_=366,24243 -export _ModuleTable_;367,24686 -export MODULEPATH;373,24929 -_ModuleTable_=374,24948 -export _ModuleTable_;375,25391 -unset LMOD_FAMILY_COMPILER_VERSION;381,25569 -unset LOADEDMODULES;382,25605 -__LMOD_REF_COUNT_MODULEPATH=383,25626 -export __LMOD_REF_COUNT_MODULEPATH;384,25695 -MODULEPATH=385,25731 -export MODULEPATH;386,25781 -unset _LMFILES_;387,25800 -_ModuleTable_=388,25817 -export _ModuleTable_;389,25995 -export LOADEDMODULES;395,26179 -MODULEPATH=396,26201 -export MODULEPATH;397,26251 -_LMFILES_=398,26270 -export _LMFILES_;399,26383 -_ModuleTable_=400,26401 -export _ModuleTable_;401,26966 -my_python=402,26988 -export my_python;403,27003 -export MODULEPATH;409,27198 -_ModuleTable_=410,27217 -export _ModuleTable_;411,27782 -export LMOD_FAMILY_COMPILER;417,27961 -LMOD_FAMILY_COMPILER_VERSION=418,27990 -export LMOD_FAMILY_COMPILER_VERSION;419,28024 -LOADEDMODULES=420,28061 -export LOADEDMODULES;421,28102 -__LMOD_REF_COUNT_MODULEPATH=422,28124 -export __LMOD_REF_COUNT_MODULEPATH;423,28233 -MODULEPATH=424,28269 -export MODULEPATH;425,28356 -_LMFILES_=426,28375 -export _LMFILES_;427,28537 -_ModuleTable_=428,28555 -export _ModuleTable_;429,29342 -my_python=430,29364 -export my_python;431,29379 -export MODULEPATH;437,29609 -_ModuleTable_=438,29628 -export _ModuleTable_;439,30415 -unset LMOD_FAMILY_COMPILER_VERSION;445,30593 -unset LOADEDMODULES;446,30629 -__LMOD_REF_COUNT_MODULEPATH=447,30650 -export __LMOD_REF_COUNT_MODULEPATH;448,30719 -MODULEPATH=449,30755 -export MODULEPATH;450,30805 -unset _LMFILES_;451,30824 -_ModuleTable_=452,30841 -export _ModuleTable_;453,31019 -unset my_python;454,31041 -export LOADEDMODULES;460,31226 -__LMOD_REF_COUNT_MODULEPATH=461,31248 -export __LMOD_REF_COUNT_MODULEPATH;462,31317 -MODULEPATH=463,31353 -export MODULEPATH;464,31403 -_LMFILES_=465,31422 -export _LMFILES_;466,31625 -_ModuleTable_=467,31643 -export _ModuleTable_;468,32501 -x=469,32523 -export x;470,32532 -y=471,32542 -export y;472,32551 -z=473,32561 -export z;474,32570 -MODULEPATH=480,32729 -export MODULEPATH;481,32779 -unset _LMFILES_;482,32798 -_ModuleTable_=483,32815 -export _ModuleTable_;484,32993 -unset x;485,33015 -unset y;486,33024 -unset z;487,33033 -export LOADEDMODULES;493,33204 -MODULEPATH=494,33226 -export MODULEPATH;495,33276 -_LMFILES_=496,33295 -export _LMFILES_;497,33450 -_ModuleTable_=498,33468 -export _ModuleTable_;499,34180 -x=500,34202 -export x;501,34211 -z=502,34221 -export z;503,34230 - -rt/depends_on_any/err.txt,1174 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule15,626 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule61,2044 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule70,2515 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule116,3933 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule125,4405 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule155,5448 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule206,7071 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule215,7543 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule224,8033 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule254,9090 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule312,10994 -Also make sure that all modulefiles written in TCL start with the string #%ModuleModule321,11472 +rt/depends_on_any/out.txt,10270 +export LOADEDMODULES;10,288 +__LMOD_REF_COUNT_MODULEPATH=11,310 +export __LMOD_REF_COUNT_MODULEPATH;12,378 +MODULEPATH=13,414 +export MODULEPATH;14,463 +Y_Name=15,482 +export Y_Name;16,496 +_LMFILES_=17,511 +export _LMFILES_;18,613 +_ModuleTable_=19,631 +export _ModuleTable_;20,1170 +MODULEPATH=30,1466 +export MODULEPATH;31,1515 +unset Y_Name;32,1534 +unset _LMFILES_;33,1548 +_ModuleTable_=34,1565 +export _ModuleTable_;35,1741 +export LOADEDMODULES;45,2044 +MODULEPATH=46,2066 +export MODULEPATH;47,2115 +Y_Name=48,2134 +export Y_Name;49,2148 +_LMFILES_=50,2163 +export _LMFILES_;51,2268 +_ModuleTable_=52,2286 +export _ModuleTable_;53,2817 +export LOADEDMODULES;59,3006 +MODULEPATH=60,3028 +export MODULEPATH;61,3077 +X_Name=62,3096 +export X_Name;63,3110 +_LMFILES_=64,3125 +export _LMFILES_;65,3324 +_ModuleTable_=66,3342 +export _ModuleTable_;67,4232 +export LOADEDMODULES;77,4533 +MODULEPATH=78,4555 +export MODULEPATH;79,4604 +unset X_Name;80,4623 +_LMFILES_=81,4637 +export _LMFILES_;82,4742 +_ModuleTable_=83,4760 +export _ModuleTable_;84,5291 +export LOADEDMODULES;94,5608 +MODULEPATH=95,5630 +export MODULEPATH;96,5679 +X_Name=97,5698 +export X_Name;98,5712 +_LMFILES_=99,5727 +export _LMFILES_;100,5926 +_ModuleTable_=101,5944 +export _ModuleTable_;102,6834 +export LOADEDMODULES;108,7024 +MODULEPATH=109,7046 +export MODULEPATH;110,7095 +X_Name=111,7114 +export X_Name;112,7128 +_LMFILES_=113,7143 +export _LMFILES_;114,7342 +_ModuleTable_=115,7360 +export _ModuleTable_;116,8238 +export LOADEDMODULES;122,8420 +MODULEPATH=123,8442 +export MODULEPATH;124,8491 +_LMFILES_=125,8510 +export _LMFILES_;126,8662 +_ModuleTable_=127,8680 +export _ModuleTable_;128,9371 +export LOADEDMODULES;138,9688 +MODULEPATH=139,9710 +export MODULEPATH;140,9759 +_LMFILES_=141,9778 +export _LMFILES_;142,9977 +_ModuleTable_=143,9995 +export _ModuleTable_;144,10873 +export LOADEDMODULES;150,11055 +MODULEPATH=151,11077 +export MODULEPATH;152,11126 +unset X_Name;153,11145 +_LMFILES_=154,11159 +export _LMFILES_;155,11311 +_ModuleTable_=156,11329 +export _ModuleTable_;157,12047 +export LOADEDMODULES;167,12350 +MODULEPATH=168,12372 +export MODULEPATH;169,12421 +_LMFILES_=170,12440 +export _LMFILES_;171,12545 +_ModuleTable_=172,12563 +export _ModuleTable_;173,13094 +export LOADEDMODULES;188,13543 +MODULEPATH=189,13565 +export MODULEPATH;190,13614 +_LMFILES_=191,13633 +export _LMFILES_;192,13785 +_ModuleTable_=193,13803 +export _ModuleTable_;194,14494 +export LOADEDMODULES;200,14692 +MODULEPATH=201,14714 +export MODULEPATH;202,14763 +_LMFILES_=203,14782 +export _LMFILES_;204,14983 +_ModuleTable_=205,15001 +export _ModuleTable_;206,15883 +export LOADEDMODULES;216,16198 +MODULEPATH=217,16220 +export MODULEPATH;218,16269 +_LMFILES_=219,16288 +export _LMFILES_;220,16440 +_ModuleTable_=221,16458 +export _ModuleTable_;222,17149 +export LOADEDMODULES;228,17347 +MODULEPATH=229,17369 +export MODULEPATH;230,17418 +X_Name=231,17437 +export X_Name;232,17451 +Y_Name=233,17466 +export Y_Name;234,17480 +_LMFILES_=235,17495 +export _LMFILES_;236,17741 +_ModuleTable_=237,17759 +export _ModuleTable_;238,18809 +export MODULEPATH;248,19134 +_ModuleTable_=249,19153 +export _ModuleTable_;250,20203 +MODULEPATH=256,20374 +export MODULEPATH;257,20423 +unset X_Name;258,20442 +unset Y_Name;259,20456 +unset _LMFILES_;260,20470 +_ModuleTable_=261,20487 +export _ModuleTable_;262,20663 +export LOADEDMODULES;268,20860 +MODULEPATH=269,20882 +export MODULEPATH;270,20931 +X_Name=271,20950 +export X_Name;272,20964 +Y_Name=273,20979 +export Y_Name;274,20993 +_LMFILES_=275,21008 +export _LMFILES_;276,21254 +_ModuleTable_=277,21272 +export _ModuleTable_;278,22322 +__LMOD_DEFAULT_MODULES_LOADED__=279,22344 +export __LMOD_DEFAULT_MODULES_LOADED__;280,22379 +export LOADEDMODULES;290,22738 +MODULEPATH=291,22760 +export MODULEPATH;292,22809 +_LMFILES_=293,22828 +export _LMFILES_;294,23123 +_ModuleTable_=295,23141 +export _ModuleTable_;296,24373 +bar=297,24395 +export bar;298,24404 +export LOADEDMODULES;304,24608 +MODULEPATH=305,24630 +export MODULEPATH;306,24679 +_LMFILES_=307,24698 +export _LMFILES_;308,25042 +_ModuleTable_=309,25060 +export _ModuleTable_;310,26485 +MODULEPATH=316,26656 +export MODULEPATH;317,26705 +unset X_Name;318,26724 +unset Y_Name;319,26738 +unset _LMFILES_;320,26752 +_ModuleTable_=321,26769 +export _ModuleTable_;322,26945 +unset bar;323,26967 +export LMOD_FAMILY_COMPILER;329,27157 +LMOD_FAMILY_COMPILER_VERSION=330,27186 +export LMOD_FAMILY_COMPILER_VERSION;331,27220 +LOADEDMODULES=332,27257 +export LOADEDMODULES;333,27314 +__LMOD_REF_COUNT_MODULEPATH=334,27336 +export __LMOD_REF_COUNT_MODULEPATH;335,27452 +MODULEPATH=336,27488 +export MODULEPATH;337,27582 +_LMFILES_=338,27601 +export _LMFILES_;339,27792 +_ModuleTable_=340,27810 +export _ModuleTable_;341,28781 +export LOADEDMODULES;347,28966 +MODULEPATH=348,28988 +export MODULEPATH;349,29082 +_LMFILES_=350,29101 +export _LMFILES_;351,29169 +_ModuleTable_=352,29187 +export _ModuleTable_;353,29720 +export LOADEDMODULES;359,29934 +MODULEPATH=360,29956 +export MODULEPATH;361,30050 +_LMFILES_=362,30069 +export _LMFILES_;363,30260 +_ModuleTable_=364,30278 +export _ModuleTable_;365,31249 +export LMOD_FAMILY_COMPILER;371,31442 +LMOD_FAMILY_COMPILER_VERSION=372,31471 +export LMOD_FAMILY_COMPILER_VERSION;373,31505 +LOADEDMODULES=374,31542 +export LOADEDMODULES;375,31599 +__LMOD_REF_COUNT_MODULEPATH=376,31621 +export __LMOD_REF_COUNT_MODULEPATH;377,31737 +MODULEPATH=378,31773 +export MODULEPATH;379,31867 +_LMFILES_=380,31886 +export _LMFILES_;381,32077 +_ModuleTable_=382,32095 +export _ModuleTable_;383,33066 +export LOADEDMODULES;389,33251 +MODULEPATH=390,33273 +export MODULEPATH;391,33367 +_LMFILES_=392,33386 +export _LMFILES_;393,33454 +_ModuleTable_=394,33472 +export _ModuleTable_;395,34005 +export MODULEPATH;401,34248 +_ModuleTable_=402,34267 +export _ModuleTable_;403,34800 +unset LMOD_FAMILY_COMPILER_VERSION;409,34978 +unset LOADEDMODULES;410,35014 +__LMOD_REF_COUNT_MODULEPATH=411,35035 +export __LMOD_REF_COUNT_MODULEPATH;412,35104 +MODULEPATH=413,35140 +export MODULEPATH;414,35190 +unset _LMFILES_;415,35209 +_ModuleTable_=416,35226 +export _ModuleTable_;417,35404 +export LMOD_FAMILY_COMPILER;423,35610 +LMOD_FAMILY_COMPILER_VERSION=424,35639 +export LMOD_FAMILY_COMPILER_VERSION;425,35673 +LOADEDMODULES=426,35710 +export LOADEDMODULES;427,35776 +__LMOD_REF_COUNT_MODULEPATH=428,35798 +export __LMOD_REF_COUNT_MODULEPATH;429,35914 +MODULEPATH=430,35950 +export MODULEPATH;431,36044 +_LMFILES_=432,36063 +export _LMFILES_;433,36311 +_ModuleTable_=434,36329 +export _ModuleTable_;435,37479 +unset LMOD_FAMILY_COMPILER_VERSION;441,37669 +unset LOADEDMODULES;442,37705 +__LMOD_REF_COUNT_MODULEPATH=443,37726 +export __LMOD_REF_COUNT_MODULEPATH;444,37795 +MODULEPATH=445,37831 +export MODULEPATH;446,37881 +unset _LMFILES_;447,37900 +_ModuleTable_=448,37917 +export _ModuleTable_;449,38689 +export LMOD_FAMILY_COMPILER;455,38882 +LMOD_FAMILY_COMPILER_VERSION=456,38911 +export LMOD_FAMILY_COMPILER_VERSION;457,38945 +LOADEDMODULES=458,38982 +export LOADEDMODULES;459,39048 +__LMOD_REF_COUNT_MODULEPATH=460,39070 +export __LMOD_REF_COUNT_MODULEPATH;461,39186 +MODULEPATH=462,39222 +export MODULEPATH;463,39316 +_LMFILES_=464,39335 +export _LMFILES_;465,39583 +_ModuleTable_=466,39601 +export _ModuleTable_;467,40783 +export MODULEPATH;473,41026 +_ModuleTable_=474,41045 +export _ModuleTable_;475,42227 +export LOADEDMODULES;481,42436 +MODULEPATH=482,42458 +export MODULEPATH;483,42552 +_LMFILES_=484,42571 +export _LMFILES_;485,42759 +_ModuleTable_=486,42777 +export _ModuleTable_;487,43736 +export MODULEPATH;493,43979 +_ModuleTable_=494,43998 +export _ModuleTable_;495,44957 +export LOADEDMODULES;501,45139 +MODULEPATH=502,45161 +export MODULEPATH;503,45255 +_LMFILES_=504,45274 +export _LMFILES_;505,45342 +_ModuleTable_=506,45360 +export _ModuleTable_;507,45893 +export MODULEPATH;513,46136 +_ModuleTable_=514,46155 +export _ModuleTable_;515,46688 +unset LMOD_FAMILY_COMPILER_VERSION;521,46866 +unset LOADEDMODULES;522,46902 +__LMOD_REF_COUNT_MODULEPATH=523,46923 +export __LMOD_REF_COUNT_MODULEPATH;524,46992 +MODULEPATH=525,47028 +export MODULEPATH;526,47078 +unset _LMFILES_;527,47097 +_ModuleTable_=528,47114 +export _ModuleTable_;529,47292 +export LOADEDMODULES;535,47476 +MODULEPATH=536,47498 +export MODULEPATH;537,47548 +_LMFILES_=538,47567 +export _LMFILES_;539,47680 +_ModuleTable_=540,47698 +export _ModuleTable_;541,48263 +my_python=542,48285 +export my_python;543,48300 +export MODULEPATH;549,48495 +_ModuleTable_=550,48514 +export _ModuleTable_;551,49079 +export LMOD_FAMILY_COMPILER;557,49258 +LMOD_FAMILY_COMPILER_VERSION=558,49287 +export LMOD_FAMILY_COMPILER_VERSION;559,49321 +LOADEDMODULES=560,49358 +export LOADEDMODULES;561,49399 +__LMOD_REF_COUNT_MODULEPATH=562,49421 +export __LMOD_REF_COUNT_MODULEPATH;563,49530 +MODULEPATH=564,49566 +export MODULEPATH;565,49653 +_LMFILES_=566,49672 +export _LMFILES_;567,49834 +_ModuleTable_=568,49852 +export _ModuleTable_;569,50722 +my_python=570,50744 +export my_python;571,50759 +export MODULEPATH;577,50989 +_ModuleTable_=578,51008 +export _ModuleTable_;579,51878 +unset LMOD_FAMILY_COMPILER_VERSION;585,52056 +unset LOADEDMODULES;586,52092 +__LMOD_REF_COUNT_MODULEPATH=587,52113 +export __LMOD_REF_COUNT_MODULEPATH;588,52182 +MODULEPATH=589,52218 +export MODULEPATH;590,52268 +unset _LMFILES_;591,52287 +_ModuleTable_=592,52304 +export _ModuleTable_;593,52482 +unset my_python;594,52504 +export LOADEDMODULES;600,52689 +__LMOD_REF_COUNT_MODULEPATH=601,52711 +export __LMOD_REF_COUNT_MODULEPATH;602,52780 +MODULEPATH=603,52816 +export MODULEPATH;604,52866 +_LMFILES_=605,52885 +export _LMFILES_;606,53088 +_ModuleTable_=607,53106 +export _ModuleTable_;608,53964 +x=609,53986 +export x;610,53995 +y=611,54005 +export y;612,54014 +z=613,54024 +export z;614,54033 +MODULEPATH=620,54192 +export MODULEPATH;621,54242 +unset _LMFILES_;622,54261 +_ModuleTable_=623,54278 +export _ModuleTable_;624,54456 +unset x;625,54478 +unset y;626,54487 +unset z;627,54496 +export LOADEDMODULES;633,54667 +MODULEPATH=634,54689 +export MODULEPATH;635,54739 +_LMFILES_=636,54758 +export _LMFILES_;637,54913 +_ModuleTable_=638,54931 +export _ModuleTable_;639,55643 +x=640,55665 +export x;641,55674 +z=642,55684 +export z;643,55693 rt/is_cmd/out.txt,581 export LOADEDMODULES;10,280 @@ -9707,13 +9831,13 @@ export RTM_C;20,582 _LMFILES_=21,596 export _LMFILES_;22,738 _ModuleTable_=23,756 -export _ModuleTable_;24,1492 -export MODULEPATH;30,1715 -_ModuleTable_=31,1734 -export _ModuleTable_;32,2470 -export MODULEPATH;38,2687 -_ModuleTable_=39,2706 -export _ModuleTable_;40,3442 +export _ModuleTable_;24,1567 +export MODULEPATH;30,1790 +_ModuleTable_=31,1809 +export _ModuleTable_;32,2620 +export MODULEPATH;38,2837 +_ModuleTable_=39,2856 +export _ModuleTable_;40,3667 rt/oscar/oscar.tdesc,19 testdescript 2,15 @@ -9835,7 +9959,7 @@ export _ModuleTable_;203,10293 rt/break/break.tdesc,21 local testName 2,15 -rt/pushenv/out.txt,8693 +rt/pushenv/out.txt,8699 export LOADEDMODULES;10,288 __LMOD_REF_COUNT_MODULEPATH=11,310 export __LMOD_REF_COUNT_MODULEPATH;12,371 @@ -9872,285 +9996,285 @@ export MODULEPATH;52,2103 _LMFILES_=53,2122 export _LMFILES_;54,2178 _ModuleTable_=55,2196 -export _ModuleTable_;56,2576 -__LMOD_STACK_CC=57,2598 -export __LMOD_STACK_CC;58,2619 -export CC;64,2785 -LOADEDMODULES=65,2796 -export LOADEDMODULES;66,2832 -MODULEPATH=67,2854 -export MODULEPATH;68,2941 -_LMFILES_=69,2960 -export _LMFILES_;70,3075 -_ModuleTable_=71,3093 -export _ModuleTable_;72,3657 -__LMOD_STACK_CC=73,3679 -export __LMOD_STACK_CC;74,3706 -export CC;80,3870 -LOADEDMODULES=81,3881 -export LOADEDMODULES;82,3927 -__LMOD_REF_COUNT_MODULEPATH=83,3949 -export __LMOD_REF_COUNT_MODULEPATH;84,4086 -MODULEPATH=85,4122 -export MODULEPATH;86,4234 -_LMFILES_=87,4253 -export _LMFILES_;88,4412 -_ModuleTable_=89,4430 -export _ModuleTable_;90,5200 -__LMOD_STACK_CC=91,5222 -export __LMOD_STACK_CC;92,5253 -export CC;98,5421 -LOADEDMODULES=99,5432 -export LOADEDMODULES;100,5468 -__LMOD_REF_COUNT_MODULEPATH=101,5490 -export __LMOD_REF_COUNT_MODULEPATH;102,5599 -MODULEPATH=103,5635 -export MODULEPATH;104,5722 -_LMFILES_=105,5741 -export _LMFILES_;106,5856 -_ModuleTable_=107,5874 -export _ModuleTable_;108,6438 -__LMOD_STACK_CC=109,6460 -export __LMOD_STACK_CC;110,6487 -export CC;116,6653 -LOADEDMODULES=117,6664 -export LOADEDMODULES;118,6690 -MODULEPATH=119,6712 -export MODULEPATH;120,6799 -_LMFILES_=121,6818 -export _LMFILES_;122,6874 -_ModuleTable_=123,6892 -export _ModuleTable_;124,7272 -__LMOD_STACK_CC=125,7294 -export __LMOD_STACK_CC;126,7315 -unset LOADEDMODULES;132,7483 -__LMOD_REF_COUNT_MODULEPATH=133,7504 -export __LMOD_REF_COUNT_MODULEPATH;134,7565 -MODULEPATH=135,7601 -export MODULEPATH;136,7643 -unset _LMFILES_;137,7662 -_ModuleTable_=138,7679 -export _ModuleTable_;139,7841 -unset __LMOD_STACK_CC;140,7863 -export CC;146,8035 -LOADEDMODULES=147,8046 -export LOADEDMODULES;148,8082 -__LMOD_REF_COUNT_MODULEPATH=149,8104 -export __LMOD_REF_COUNT_MODULEPATH;150,8213 -MODULEPATH=151,8249 -export MODULEPATH;152,8336 -_LMFILES_=153,8355 -export _LMFILES_;154,8470 -_ModuleTable_=155,8488 -export _ModuleTable_;156,9052 -__LMOD_STACK_CC=157,9074 -export __LMOD_STACK_CC;158,9101 -unset LOADEDMODULES;164,9270 -__LMOD_REF_COUNT_MODULEPATH=165,9291 -export __LMOD_REF_COUNT_MODULEPATH;166,9352 -MODULEPATH=167,9388 -export MODULEPATH;168,9430 -unset _LMFILES_;169,9449 -_ModuleTable_=170,9466 -export _ModuleTable_;171,9815 -unset __LMOD_STACK_CC;172,9837 -export CC;178,10003 -LOADEDMODULES=179,10014 -export LOADEDMODULES;180,10050 -__LMOD_REF_COUNT_MODULEPATH=181,10072 -export __LMOD_REF_COUNT_MODULEPATH;182,10181 -MODULEPATH=183,10217 -export MODULEPATH;184,10304 -_LMFILES_=185,10323 -export _LMFILES_;186,10438 -_ModuleTable_=187,10456 -export _ModuleTable_;188,11020 -__LMOD_STACK_CC=189,11042 -export __LMOD_STACK_CC;190,11069 -export LOADEDMODULES;196,11276 -MODULEPATH=197,11298 -export MODULEPATH;198,11385 -RTM_SETTARG_CMD=199,11404 -export RTM_SETTARG_CMD;200,11433 -_LMFILES_=201,11457 -export _LMFILES_;202,11618 -_ModuleTable_=203,11636 -export _ModuleTable_;204,12377 -__LMOD_STACK_RTM_SETTARG_CMD=205,12399 -export __LMOD_STACK_RTM_SETTARG_CMD;206,12443 -export LOADEDMODULES;212,12653 -MODULEPATH=213,12675 -export MODULEPATH;214,12762 -RTM_SETTARG_CMD=215,12781 -export RTM_SETTARG_CMD;216,12800 -_LMFILES_=217,12824 -export _LMFILES_;218,12939 -_ModuleTable_=219,12957 -export _ModuleTable_;220,13521 -__LMOD_STACK_RTM_SETTARG_CMD=221,13543 -export __LMOD_STACK_RTM_SETTARG_CMD;222,13575 -export LEWIS;228,13761 -LOADEDMODULES=229,13775 -export LOADEDMODULES;230,13818 -MODULEPATH=231,13840 -export MODULEPATH;232,13927 -RTM=233,13946 -export RTM;234,13959 -_LMFILES_=235,13971 -export _LMFILES_;236,14127 -_ModuleTable_=237,14145 -export _ModuleTable_;238,14870 -__LMOD_STACK_LEWIS=239,14892 -export __LMOD_STACK_LEWIS;240,14925 -__LMOD_STACK_RTM=241,14952 -export __LMOD_STACK_RTM;242,14983 -export LEWIS;248,15156 -LOADEDMODULES=249,15170 -export LOADEDMODULES;250,15206 -MODULEPATH=251,15228 -export MODULEPATH;252,15315 -RTM=253,15334 -export RTM;254,15344 -_LMFILES_=255,15356 -export _LMFILES_;256,15471 -_ModuleTable_=257,15489 -export _ModuleTable_;258,16053 -__LMOD_STACK_LEWIS=259,16075 -export __LMOD_STACK_LEWIS;260,16100 -__LMOD_STACK_RTM=261,16127 -export __LMOD_STACK_RTM;262,16150 -export LEWIS;268,16317 -LOADEDMODULES=269,16331 -export LOADEDMODULES;270,16374 -MODULEPATH=271,16396 -export MODULEPATH;272,16483 -RTM=273,16502 -export RTM;274,16510 -_LMFILES_=275,16522 -export _LMFILES_;276,16678 -_ModuleTable_=277,16696 -export _ModuleTable_;278,17421 -__LMOD_STACK_LEWIS=279,17443 -export __LMOD_STACK_LEWIS;280,17469 -__LMOD_STACK_RTM=281,17496 -export __LMOD_STACK_RTM;282,17522 -export LEWIS;288,17695 -LOADEDMODULES=289,17709 -export LOADEDMODULES;290,17745 -MODULEPATH=291,17767 -export MODULEPATH;292,17854 -RTM=293,17873 -export RTM;294,17883 -_LMFILES_=295,17895 -export _LMFILES_;296,18010 -_ModuleTable_=297,18028 -export _ModuleTable_;298,18592 -__LMOD_STACK_LEWIS=299,18614 -export __LMOD_STACK_LEWIS;300,18639 -__LMOD_STACK_RTM=301,18666 -export __LMOD_STACK_RTM;302,18689 -LOADEDMODULES=308,18860 -export LOADEDMODULES;309,18906 -MODULEPATH=310,18928 -export MODULEPATH;311,19015 -_LMFILES_=312,19034 -export _LMFILES_;313,19193 -_ModuleTable_=314,19211 -export _ModuleTable_;315,19944 -__LMOD_STACK_LLOYD=316,19966 -export __LMOD_STACK_LLOYD;317,19996 -export LLOYD;323,20169 -LOADEDMODULES=324,20183 -export LOADEDMODULES;325,20219 -MODULEPATH=326,20241 -export MODULEPATH;327,20328 -_LMFILES_=328,20347 -export _LMFILES_;329,20462 -_ModuleTable_=330,20480 -export _ModuleTable_;331,21044 -__LMOD_STACK_LLOYD=332,21066 -export __LMOD_STACK_LLOYD;333,21090 -export MODULEPATH;339,21331 -_ModuleTable_=340,21350 -export _ModuleTable_;341,21914 -export CC;347,22076 -MODULEPATH=348,22087 -export MODULEPATH;349,22174 -_ModuleTable_=350,22193 -export _ModuleTable_;351,22757 -__LMOD_DEFAULT_MODULES_LOADED__=352,22779 -export __LMOD_DEFAULT_MODULES_LOADED__;353,22814 -__LMOD_STACK_CC=354,22854 -export __LMOD_STACK_CC;355,22881 -unset LOADEDMODULES;361,23043 -__LMOD_REF_COUNT_MODULEPATH=362,23064 -export __LMOD_REF_COUNT_MODULEPATH;363,23125 -MODULEPATH=364,23161 -export MODULEPATH;365,23203 -unset _LMFILES_;366,23222 -_ModuleTable_=367,23239 -export _ModuleTable_;368,23401 -unset __LMOD_STACK_CC;369,23423 -export A;375,23587 -unset B;376,23597 -BAR=377,23606 -export BAR;378,23612 -BAZ=379,23624 -export BAZ;380,23632 -C=381,23644 -export C;382,23652 -FOO=383,23662 -export FOO;384,23668 -LOADEDMODULES=385,23680 -export LOADEDMODULES;386,23701 -__LMOD_REF_COUNT_MODULEPATH=387,23723 -export __LMOD_REF_COUNT_MODULEPATH;388,23785 -MODULEPATH=389,23821 -export MODULEPATH;390,23864 -_LMFILES_=391,23883 -export _LMFILES_;392,23935 -_ModuleTable_=393,23953 -export _ModuleTable_;394,24271 -__LMOD_STACK_A=395,24293 -export __LMOD_STACK_A;396,24314 -__LMOD_STACK_B=397,24337 -export __LMOD_STACK_B;398,24359 -__LMOD_STACK_BAZ=399,24382 -export __LMOD_STACK_BAZ;400,24403 -__LMOD_STACK_C=401,24428 -export __LMOD_STACK_C;402,24449 -__LMOD_STACK_FOO=403,24472 -export __LMOD_STACK_FOO;404,24493 -export BAZ;410,24664 -FOO=411,24676 -export FOO;412,24688 -LOADEDMODULES=413,24700 -export LOADEDMODULES;414,24728 -MODULEPATH=415,24750 -export MODULEPATH;416,24793 -_LMFILES_=417,24812 -export _LMFILES_;418,24906 -_ModuleTable_=419,24924 -export _ModuleTable_;420,25400 -__LMOD_STACK_BAZ=421,25422 -export __LMOD_STACK_BAZ;422,25450 -__LMOD_STACK_FOO=423,25475 -export __LMOD_STACK_FOO;424,25502 -export BAZ;430,25671 -FOO=431,25683 -export FOO;432,25689 -LOADEDMODULES=433,25701 -export LOADEDMODULES;434,25722 -MODULEPATH=435,25744 -export MODULEPATH;436,25787 -_LMFILES_=437,25806 -export _LMFILES_;438,25858 -_ModuleTable_=439,25876 -export _ModuleTable_;440,26194 -__LMOD_STACK_BAZ=441,26216 -export __LMOD_STACK_BAZ;442,26237 -__LMOD_STACK_FOO=443,26262 -export __LMOD_STACK_FOO;444,26283 +export _ModuleTable_;56,2667 +__LMOD_STACK_CC=57,2689 +export __LMOD_STACK_CC;58,2710 +export CC;64,2876 +LOADEDMODULES=65,2887 +export LOADEDMODULES;66,2923 +MODULEPATH=67,2945 +export MODULEPATH;68,3032 +_LMFILES_=69,3051 +export _LMFILES_;70,3166 +_ModuleTable_=71,3184 +export _ModuleTable_;72,3839 +__LMOD_STACK_CC=73,3861 +export __LMOD_STACK_CC;74,3888 +export CC;80,4052 +LOADEDMODULES=81,4063 +export LOADEDMODULES;82,4109 +__LMOD_REF_COUNT_MODULEPATH=83,4131 +export __LMOD_REF_COUNT_MODULEPATH;84,4268 +MODULEPATH=85,4304 +export MODULEPATH;86,4416 +_LMFILES_=87,4435 +export _LMFILES_;88,4594 +_ModuleTable_=89,4612 +export _ModuleTable_;90,5544 +__LMOD_STACK_CC=91,5566 +export __LMOD_STACK_CC;92,5597 +export CC;98,5765 +LOADEDMODULES=99,5776 +export LOADEDMODULES;100,5812 +__LMOD_REF_COUNT_MODULEPATH=101,5834 +export __LMOD_REF_COUNT_MODULEPATH;102,5943 +MODULEPATH=103,5979 +export MODULEPATH;104,6066 +_LMFILES_=105,6085 +export _LMFILES_;106,6200 +_ModuleTable_=107,6218 +export _ModuleTable_;108,6873 +__LMOD_STACK_CC=109,6895 +export __LMOD_STACK_CC;110,6922 +export CC;116,7088 +LOADEDMODULES=117,7099 +export LOADEDMODULES;118,7125 +MODULEPATH=119,7147 +export MODULEPATH;120,7234 +_LMFILES_=121,7253 +export _LMFILES_;122,7309 +_ModuleTable_=123,7327 +export _ModuleTable_;124,7798 +__LMOD_STACK_CC=125,7820 +export __LMOD_STACK_CC;126,7841 +unset LOADEDMODULES;132,8009 +__LMOD_REF_COUNT_MODULEPATH=133,8030 +export __LMOD_REF_COUNT_MODULEPATH;134,8091 +MODULEPATH=135,8127 +export MODULEPATH;136,8169 +unset _LMFILES_;137,8188 +_ModuleTable_=138,8205 +export _ModuleTable_;139,8367 +unset __LMOD_STACK_CC;140,8389 +export CC;146,8561 +LOADEDMODULES=147,8572 +export LOADEDMODULES;148,8608 +__LMOD_REF_COUNT_MODULEPATH=149,8630 +export __LMOD_REF_COUNT_MODULEPATH;150,8739 +MODULEPATH=151,8775 +export MODULEPATH;152,8862 +_LMFILES_=153,8881 +export _LMFILES_;154,8996 +_ModuleTable_=155,9014 +export _ModuleTable_;156,9669 +__LMOD_STACK_CC=157,9691 +export __LMOD_STACK_CC;158,9718 +unset LOADEDMODULES;164,9887 +__LMOD_REF_COUNT_MODULEPATH=165,9908 +export __LMOD_REF_COUNT_MODULEPATH;166,9969 +MODULEPATH=167,10005 +export MODULEPATH;168,10047 +unset _LMFILES_;169,10066 +_ModuleTable_=170,10083 +export _ModuleTable_;171,10432 +unset __LMOD_STACK_CC;172,10454 +export CC;178,10620 +LOADEDMODULES=179,10631 +export LOADEDMODULES;180,10667 +__LMOD_REF_COUNT_MODULEPATH=181,10689 +export __LMOD_REF_COUNT_MODULEPATH;182,10798 +MODULEPATH=183,10834 +export MODULEPATH;184,10921 +_LMFILES_=185,10940 +export _LMFILES_;186,11055 +_ModuleTable_=187,11073 +export _ModuleTable_;188,11728 +__LMOD_STACK_CC=189,11750 +export __LMOD_STACK_CC;190,11777 +export LOADEDMODULES;196,11984 +MODULEPATH=197,12006 +export MODULEPATH;198,12093 +RTM_SETTARG_CMD=199,12112 +export RTM_SETTARG_CMD;200,12141 +_LMFILES_=201,12165 +export _LMFILES_;202,12326 +_ModuleTable_=203,12344 +export _ModuleTable_;204,13176 +__LMOD_STACK_RTM_SETTARG_CMD=205,13198 +export __LMOD_STACK_RTM_SETTARG_CMD;206,13242 +export LOADEDMODULES;212,13452 +MODULEPATH=213,13474 +export MODULEPATH;214,13561 +RTM_SETTARG_CMD=215,13580 +export RTM_SETTARG_CMD;216,13599 +_LMFILES_=217,13623 +export _LMFILES_;218,13738 +_ModuleTable_=219,13756 +export _ModuleTable_;220,14411 +__LMOD_STACK_RTM_SETTARG_CMD=221,14433 +export __LMOD_STACK_RTM_SETTARG_CMD;222,14465 +export LEWIS;228,14651 +LOADEDMODULES=229,14665 +export LOADEDMODULES;230,14708 +MODULEPATH=231,14730 +export MODULEPATH;232,14817 +RTM=233,14836 +export RTM;234,14849 +_LMFILES_=235,14861 +export _LMFILES_;236,15017 +_ModuleTable_=237,15035 +export _ModuleTable_;238,15851 +__LMOD_STACK_LEWIS=239,15873 +export __LMOD_STACK_LEWIS;240,15906 +__LMOD_STACK_RTM=241,15933 +export __LMOD_STACK_RTM;242,15964 +export LEWIS;248,16137 +LOADEDMODULES=249,16151 +export LOADEDMODULES;250,16187 +MODULEPATH=251,16209 +export MODULEPATH;252,16296 +RTM=253,16315 +export RTM;254,16325 +_LMFILES_=255,16337 +export _LMFILES_;256,16452 +_ModuleTable_=257,16470 +export _ModuleTable_;258,17125 +__LMOD_STACK_LEWIS=259,17147 +export __LMOD_STACK_LEWIS;260,17172 +__LMOD_STACK_RTM=261,17199 +export __LMOD_STACK_RTM;262,17222 +export LEWIS;268,17389 +LOADEDMODULES=269,17403 +export LOADEDMODULES;270,17446 +MODULEPATH=271,17468 +export MODULEPATH;272,17555 +RTM=273,17574 +export RTM;274,17582 +_LMFILES_=275,17594 +export _LMFILES_;276,17750 +_ModuleTable_=277,17768 +export _ModuleTable_;278,18584 +__LMOD_STACK_LEWIS=279,18606 +export __LMOD_STACK_LEWIS;280,18632 +__LMOD_STACK_RTM=281,18659 +export __LMOD_STACK_RTM;282,18685 +export LEWIS;288,18858 +LOADEDMODULES=289,18872 +export LOADEDMODULES;290,18908 +MODULEPATH=291,18930 +export MODULEPATH;292,19017 +RTM=293,19036 +export RTM;294,19046 +_LMFILES_=295,19058 +export _LMFILES_;296,19173 +_ModuleTable_=297,19191 +export _ModuleTable_;298,19846 +__LMOD_STACK_LEWIS=299,19868 +export __LMOD_STACK_LEWIS;300,19893 +__LMOD_STACK_RTM=301,19920 +export __LMOD_STACK_RTM;302,19943 +LOADEDMODULES=308,20114 +export LOADEDMODULES;309,20160 +MODULEPATH=310,20182 +export MODULEPATH;311,20269 +_LMFILES_=312,20288 +export _LMFILES_;313,20447 +_ModuleTable_=314,20465 +export _ModuleTable_;315,21289 +__LMOD_STACK_LLOYD=316,21311 +export __LMOD_STACK_LLOYD;317,21341 +export LLOYD;323,21514 +LOADEDMODULES=324,21528 +export LOADEDMODULES;325,21564 +MODULEPATH=326,21586 +export MODULEPATH;327,21673 +_LMFILES_=328,21692 +export _LMFILES_;329,21807 +_ModuleTable_=330,21825 +export _ModuleTable_;331,22480 +__LMOD_STACK_LLOYD=332,22502 +export __LMOD_STACK_LLOYD;333,22526 +export MODULEPATH;339,22767 +_ModuleTable_=340,22786 +export _ModuleTable_;341,23441 +export CC;347,23603 +MODULEPATH=348,23614 +export MODULEPATH;349,23701 +_ModuleTable_=350,23720 +export _ModuleTable_;351,24375 +__LMOD_DEFAULT_MODULES_LOADED__=352,24397 +export __LMOD_DEFAULT_MODULES_LOADED__;353,24432 +__LMOD_STACK_CC=354,24472 +export __LMOD_STACK_CC;355,24499 +unset LOADEDMODULES;361,24661 +__LMOD_REF_COUNT_MODULEPATH=362,24682 +export __LMOD_REF_COUNT_MODULEPATH;363,24743 +MODULEPATH=364,24779 +export MODULEPATH;365,24821 +unset _LMFILES_;366,24840 +_ModuleTable_=367,24857 +export _ModuleTable_;368,25019 +unset __LMOD_STACK_CC;369,25041 +export A;375,25205 +unset B;376,25215 +BAR=377,25224 +export BAR;378,25230 +BAZ=379,25242 +export BAZ;380,25250 +C=381,25262 +export C;382,25270 +FOO=383,25280 +export FOO;384,25286 +LOADEDMODULES=385,25298 +export LOADEDMODULES;386,25319 +__LMOD_REF_COUNT_MODULEPATH=387,25341 +export __LMOD_REF_COUNT_MODULEPATH;388,25403 +MODULEPATH=389,25439 +export MODULEPATH;390,25482 +_LMFILES_=391,25501 +export _LMFILES_;392,25553 +_ModuleTable_=393,25571 +export _ModuleTable_;394,25889 +__LMOD_STACK_A=395,25911 +export __LMOD_STACK_A;396,25932 +__LMOD_STACK_B=397,25955 +export __LMOD_STACK_B;398,25977 +__LMOD_STACK_BAZ=399,26000 +export __LMOD_STACK_BAZ;400,26021 +__LMOD_STACK_C=401,26046 +export __LMOD_STACK_C;402,26067 +__LMOD_STACK_FOO=403,26090 +export __LMOD_STACK_FOO;404,26111 +export BAZ;410,26282 +FOO=411,26294 +export FOO;412,26306 +LOADEDMODULES=413,26318 +export LOADEDMODULES;414,26346 +MODULEPATH=415,26368 +export MODULEPATH;416,26411 +_LMFILES_=417,26430 +export _LMFILES_;418,26524 +_ModuleTable_=419,26542 +export _ModuleTable_;420,27018 +__LMOD_STACK_BAZ=421,27040 +export __LMOD_STACK_BAZ;422,27068 +__LMOD_STACK_FOO=423,27093 +export __LMOD_STACK_FOO;424,27120 +export BAZ;430,27289 +FOO=431,27301 +export FOO;432,27307 +LOADEDMODULES=433,27319 +export LOADEDMODULES;434,27340 +MODULEPATH=435,27362 +export MODULEPATH;436,27405 +_LMFILES_=437,27424 +export _LMFILES_;438,27476 +_ModuleTable_=439,27494 +export _ModuleTable_;440,27812 +__LMOD_STACK_BAZ=441,27834 +export __LMOD_STACK_BAZ;442,27855 +__LMOD_STACK_FOO=443,27880 +export __LMOD_STACK_FOO;444,27901 rt/pushenv/pushenv.tdesc,19 testdescript 2,15 @@ -10188,36 +10312,36 @@ export PATH;38,2141 _LMFILES_=39,2154 export _LMFILES_;40,2371 _ModuleTable_=41,2389 -export _ModuleTable_;42,3432 -export JUNK;48,3598 -LOADEDMODULES=49,3611 -export LOADEDMODULES;50,3688 -MODULEPATH=51,3710 -export MODULEPATH;52,3773 -_LMFILES_=53,3792 -export _LMFILES_;54,4051 -_ModuleTable_=55,4069 -export _ModuleTable_;56,5286 -export JUNK;62,5454 -LOADEDMODULES=63,5467 -export LOADEDMODULES;64,5557 -MODULEPATH=65,5579 -export MODULEPATH;66,5642 -_LMFILES_=67,5661 -export _LMFILES_;68,5964 -_ModuleTable_=69,5982 -export _ModuleTable_;70,7381 -export MODULEPATH;76,7592 -_ModuleTable_=77,7611 -export _ModuleTable_;78,9010 -LOADEDMODULES=84,9182 -export LOADEDMODULES;85,9259 -MODULEPATH=86,9281 -export MODULEPATH;87,9344 -_LMFILES_=88,9363 -export _LMFILES_;89,9622 -_ModuleTable_=90,9640 -export _ModuleTable_;91,10857 +export _ModuleTable_;42,3502 +export JUNK;48,3668 +LOADEDMODULES=49,3681 +export LOADEDMODULES;50,3758 +MODULEPATH=51,3780 +export MODULEPATH;52,3843 +_LMFILES_=53,3862 +export _LMFILES_;54,4121 +_ModuleTable_=55,4139 +export _ModuleTable_;56,5426 +export JUNK;62,5594 +LOADEDMODULES=63,5607 +export LOADEDMODULES;64,5697 +MODULEPATH=65,5719 +export MODULEPATH;66,5782 +_LMFILES_=67,5801 +export _LMFILES_;68,6104 +_ModuleTable_=69,6122 +export _ModuleTable_;70,7591 +export MODULEPATH;76,7802 +_ModuleTable_=77,7821 +export _ModuleTable_;78,9290 +LOADEDMODULES=84,9462 +export LOADEDMODULES;85,9539 +MODULEPATH=86,9561 +export MODULEPATH;87,9624 +_LMFILES_=88,9643 +export _LMFILES_;89,9902 +_ModuleTable_=90,9920 +export _ModuleTable_;91,11207 rt/junk/junk.tdesc,21 local testName 2,15 @@ -10313,61 +10437,61 @@ export PATH;56,3318 _LMFILES_=57,3331 export _LMFILES_;58,3555 _ModuleTable_=59,3573 -export _ModuleTable_;60,4691 -unset INFOPATH;66,4881 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;67,4897 -unset LD_LIBRARY_PATH;68,4937 -unset LMOD_FAMILY_COMPILER;69,4960 -unset LMOD_FAMILY_COMPILER_VERSION;70,4988 -unset LOADEDMODULES;71,5024 -unset __LMOD_REF_COUNT_MANPATH;72,5045 -unset MANPATH;73,5077 -unset MKL_DIR;74,5092 -unset MKL_INCLUDE;75,5107 -__LMOD_REF_COUNT_MODULEPATH=76,5126 -export __LMOD_REF_COUNT_MODULEPATH;77,5216 -MODULEPATH=78,5252 -export MODULEPATH;79,5320 -__LMOD_REF_COUNT_PATH=80,5339 -export __LMOD_REF_COUNT_PATH;81,5399 -PATH=82,5429 -export PATH;83,5467 -unset _LMFILES_;84,5480 -_ModuleTable_=85,5497 -export _ModuleTable_;86,5713 -export __LMOD_REF_COUNT_INFOPATH;92,5928 -INFOPATH=93,5962 -export INFOPATH;94,6000 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=95,6017 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;96,6178 -LD_LIBRARY_PATH=97,6219 -export LD_LIBRARY_PATH;98,6352 -LMOD_FAMILY_COMPILER=99,6376 -export LMOD_FAMILY_COMPILER;100,6404 -LMOD_FAMILY_COMPILER_VERSION=101,6433 -export LMOD_FAMILY_COMPILER_VERSION;102,6469 -LOADEDMODULES=103,6506 -export LOADEDMODULES;104,6574 -__LMOD_REF_COUNT_MANPATH=105,6596 -export __LMOD_REF_COUNT_MANPATH;106,6793 -MANPATH=107,6826 -export MANPATH;108,6989 -MKL_DIR=109,7005 -export MKL_DIR;110,7047 -MKL_INCLUDE=111,7063 -export MKL_INCLUDE;112,7109 -__LMOD_REF_COUNT_MODULEPATH=113,7129 -export __LMOD_REF_COUNT_MODULEPATH;114,7265 -MODULEPATH=115,7301 -export MODULEPATH;116,7412 -__LMOD_REF_COUNT_PATH=117,7431 -export __LMOD_REF_COUNT_PATH;118,7666 -PATH=119,7696 -export PATH;120,7891 -_LMFILES_=121,7904 -export _LMFILES_;122,8128 -_ModuleTable_=123,8146 -export _ModuleTable_;124,9264 +export _ModuleTable_;60,4780 +unset INFOPATH;66,4970 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;67,4986 +unset LD_LIBRARY_PATH;68,5026 +unset LMOD_FAMILY_COMPILER;69,5049 +unset LMOD_FAMILY_COMPILER_VERSION;70,5077 +unset LOADEDMODULES;71,5113 +unset __LMOD_REF_COUNT_MANPATH;72,5134 +unset MANPATH;73,5166 +unset MKL_DIR;74,5181 +unset MKL_INCLUDE;75,5196 +__LMOD_REF_COUNT_MODULEPATH=76,5215 +export __LMOD_REF_COUNT_MODULEPATH;77,5305 +MODULEPATH=78,5341 +export MODULEPATH;79,5409 +__LMOD_REF_COUNT_PATH=80,5428 +export __LMOD_REF_COUNT_PATH;81,5488 +PATH=82,5518 +export PATH;83,5556 +unset _LMFILES_;84,5569 +_ModuleTable_=85,5586 +export _ModuleTable_;86,5802 +export __LMOD_REF_COUNT_INFOPATH;92,6017 +INFOPATH=93,6051 +export INFOPATH;94,6089 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=95,6106 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;96,6267 +LD_LIBRARY_PATH=97,6308 +export LD_LIBRARY_PATH;98,6441 +LMOD_FAMILY_COMPILER=99,6465 +export LMOD_FAMILY_COMPILER;100,6493 +LMOD_FAMILY_COMPILER_VERSION=101,6522 +export LMOD_FAMILY_COMPILER_VERSION;102,6558 +LOADEDMODULES=103,6595 +export LOADEDMODULES;104,6663 +__LMOD_REF_COUNT_MANPATH=105,6685 +export __LMOD_REF_COUNT_MANPATH;106,6882 +MANPATH=107,6915 +export MANPATH;108,7078 +MKL_DIR=109,7094 +export MKL_DIR;110,7136 +MKL_INCLUDE=111,7152 +export MKL_INCLUDE;112,7198 +__LMOD_REF_COUNT_MODULEPATH=113,7218 +export __LMOD_REF_COUNT_MODULEPATH;114,7354 +MODULEPATH=115,7390 +export MODULEPATH;116,7501 +__LMOD_REF_COUNT_PATH=117,7520 +export __LMOD_REF_COUNT_PATH;118,7755 +PATH=119,7785 +export PATH;120,7980 +_LMFILES_=121,7993 +export _LMFILES_;122,8217 +_ModuleTable_=123,8235 +export _ModuleTable_;124,9442 rt/broken_modulerc/broken_modulerc.tdesc,21 local testName 3,16 @@ -10408,7 +10532,7 @@ export _ModuleTable_;18,868 rt/purge/purge.tdesc,19 testdescript 2,15 -rt/purge/out.txt,9237 +rt/purge/out.txt,9241 export __LMOD_REF_COUNT_INFOPATH;10,332 INFOPATH=11,366 export INFOPATH;12,404 @@ -10447,269 +10571,269 @@ export PATH;44,2835 _LMFILES_=45,2848 export _LMFILES_;46,3133 _ModuleTable_=47,3151 -export _ModuleTable_;48,4493 -export MODULEPATH;54,4776 -_ModuleTable_=55,4795 -export _ModuleTable_;56,6137 -unset INFOPATH;62,6335 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;63,6351 -unset LD_LIBRARY_PATH;64,6391 -unset LMOD_FAMILY_COMPILER;65,6414 -unset LMOD_FAMILY_COMPILER_VERSION;66,6442 -unset LMOD_FAMILY_MPI;67,6478 -unset LMOD_FAMILY_MPI_VERSION;68,6501 -unset LOADEDMODULES;69,6532 -unset __LMOD_REF_COUNT_MANPATH;70,6553 -unset MANPATH;71,6585 -unset MKL_DIR;72,6600 -unset MKL_INCLUDE;73,6615 -__LMOD_REF_COUNT_MODULEPATH=74,6634 -export __LMOD_REF_COUNT_MODULEPATH;75,6693 -MODULEPATH=76,6729 -export MODULEPATH;77,6769 -unset MPIHOME;78,6788 -__LMOD_REF_COUNT_PATH=79,6803 -export __LMOD_REF_COUNT_PATH;80,6863 -PATH=81,6893 -export PATH;82,6931 -unset _LMFILES_;83,6944 -_ModuleTable_=84,6961 -export _ModuleTable_;85,7119 -export MODULEPATH;91,7307 -_ModuleTable_=92,7326 -export _ModuleTable_;93,7484 -export ADMIN_MODULE_LOADED;99,7685 -__LMOD_REF_COUNT_INFOPATH=100,7713 -export __LMOD_REF_COUNT_INFOPATH;101,7773 -INFOPATH=102,7807 -export INFOPATH;103,7845 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=104,7862 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;105,8074 -LD_LIBRARY_PATH=106,8115 -export LD_LIBRARY_PATH;107,8296 -LMOD_FAMILY_COMPILER=108,8320 -export LMOD_FAMILY_COMPILER;109,8348 -LMOD_FAMILY_COMPILER_VERSION=110,8377 -export LMOD_FAMILY_COMPILER_VERSION;111,8413 -LMOD_FAMILY_MPI=112,8450 -export LMOD_FAMILY_MPI;113,8475 -LMOD_FAMILY_MPI_VERSION=114,8499 -export LMOD_FAMILY_MPI_VERSION;115,8530 -LOADEDMODULES=116,8562 -export LOADEDMODULES;117,8673 -__LMOD_REF_COUNT_MANPATH=118,8695 -export __LMOD_REF_COUNT_MANPATH;119,8943 -MANPATH=120,8976 -export MANPATH;121,9187 -MKL_DIR=122,9203 -export MKL_DIR;123,9245 -MKL_INCLUDE=124,9261 -export MKL_INCLUDE;125,9307 -__LMOD_REF_COUNT_MODULEPATH=126,9327 -export __LMOD_REF_COUNT_MODULEPATH;127,9487 -MODULEPATH=128,9523 -export MODULEPATH;129,9658 -MPIHOME=130,9677 -export MPIHOME;131,9730 -__LMOD_REF_COUNT_PATH=132,9746 -export __LMOD_REF_COUNT_PATH;133,10054 -PATH=134,10084 -export PATH;135,10343 -TACC_PMETIS_BIN=136,10356 -export TACC_PMETIS_BIN;137,10415 -TACC_PMETIS_DIR=138,10439 -export TACC_PMETIS_DIR;139,10498 -TACC_PMETIS_DOC=140,10522 -export TACC_PMETIS_DOC;141,10588 -TACC_PMETIS_INC=142,10612 -export TACC_PMETIS_INC;143,10671 -TACC_PMETIS_LIB=144,10695 -export TACC_PMETIS_LIB;145,10754 -_LMFILES_=146,10778 -export _LMFILES_;147,11180 -_ModuleTable_=148,11198 -export _ModuleTable_;149,12962 -export MODULEPATH;155,13245 -_ModuleTable_=156,13264 -export _ModuleTable_;157,15028 -unset __LMOD_REF_COUNT_INFOPATH;163,15204 -unset INFOPATH;164,15237 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;165,15253 -unset LD_LIBRARY_PATH;166,15293 -unset LMOD_FAMILY_COMPILER;167,15316 -unset LMOD_FAMILY_COMPILER_VERSION;168,15344 -unset LMOD_FAMILY_MPI;169,15380 -unset LMOD_FAMILY_MPI_VERSION;170,15403 -unset LOADEDMODULES;171,15434 -unset __LMOD_REF_COUNT_MANPATH;172,15455 -unset MANPATH;173,15487 -unset MKL_DIR;174,15502 -unset MKL_INCLUDE;175,15517 -__LMOD_REF_COUNT_MODULEPATH=176,15536 -export __LMOD_REF_COUNT_MODULEPATH;177,15595 -MODULEPATH=178,15631 -export MODULEPATH;179,15671 -unset MPIHOME;180,15690 -__LMOD_REF_COUNT_PATH=181,15705 -export __LMOD_REF_COUNT_PATH;182,15765 -PATH=183,15795 -export PATH;184,15833 -unset TACC_PMETIS_BIN;185,15846 -unset TACC_PMETIS_DIR;186,15869 -unset TACC_PMETIS_DOC;187,15892 -unset TACC_PMETIS_INC;188,15915 -unset TACC_PMETIS_LIB;189,15938 -unset _LMFILES_;190,15961 -_ModuleTable_=191,15978 -export _ModuleTable_;192,16136 -export MODULEPATH;198,16324 -_ModuleTable_=199,16343 -export _ModuleTable_;200,16501 -export __LMOD_REF_COUNT_INFOPATH;206,16725 -INFOPATH=207,16759 -export INFOPATH;208,16797 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=209,16814 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;210,17026 -LD_LIBRARY_PATH=211,17067 -export LD_LIBRARY_PATH;212,17248 -LMOD_FAMILY_COMPILER=213,17272 -export LMOD_FAMILY_COMPILER;214,17300 -LMOD_FAMILY_COMPILER_VERSION=215,17329 -export LMOD_FAMILY_COMPILER_VERSION;216,17365 -LMOD_FAMILY_MPI=217,17402 -export LMOD_FAMILY_MPI;218,17427 -LMOD_FAMILY_MPI_VERSION=219,17451 -export LMOD_FAMILY_MPI_VERSION;220,17482 -LOADEDMODULES=221,17514 -export LOADEDMODULES;222,17596 -__LMOD_REF_COUNT_MANPATH=223,17618 -export __LMOD_REF_COUNT_MANPATH;224,17866 -MANPATH=225,17899 -export MANPATH;226,18110 -MKL_DIR=227,18126 -export MKL_DIR;228,18168 -MKL_INCLUDE=229,18184 -export MKL_INCLUDE;230,18230 -__LMOD_REF_COUNT_MODULEPATH=231,18250 -export __LMOD_REF_COUNT_MODULEPATH;232,18410 -MODULEPATH=233,18446 -export MODULEPATH;234,18581 -MPIHOME=235,18600 -export MPIHOME;236,18653 -__LMOD_REF_COUNT_PATH=237,18669 -export __LMOD_REF_COUNT_PATH;238,18955 -PATH=239,18985 -export PATH;240,19228 -_LMFILES_=241,19241 -export _LMFILES_;242,19526 -_ModuleTable_=243,19544 -export _ModuleTable_;244,20886 -export MODULEPATH;250,21175 -_ModuleTable_=251,21194 -export _ModuleTable_;252,22536 -unset INFOPATH;258,22723 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;259,22739 -unset LD_LIBRARY_PATH;260,22779 -unset LMOD_FAMILY_COMPILER;261,22802 -unset LMOD_FAMILY_COMPILER_VERSION;262,22830 -unset LMOD_FAMILY_MPI;263,22866 -unset LMOD_FAMILY_MPI_VERSION;264,22889 -LOADEDMODULES=265,22920 -export LOADEDMODULES;266,22946 -unset __LMOD_REF_COUNT_MANPATH;267,22968 -unset MANPATH;268,23000 -unset MKL_DIR;269,23015 -unset MKL_INCLUDE;270,23030 -__LMOD_REF_COUNT_MODULEPATH=271,23049 -export __LMOD_REF_COUNT_MODULEPATH;272,23108 -MODULEPATH=273,23144 -export MODULEPATH;274,23184 -unset MPIHOME;275,23203 -__LMOD_REF_COUNT_PATH=276,23218 -export __LMOD_REF_COUNT_PATH;277,23278 -PATH=278,23308 -export PATH;279,23346 -TEST=280,23359 -export TEST;281,23367 -_LMFILES_=282,23380 -export _LMFILES_;283,23434 -_ModuleTable_=284,23452 -export _ModuleTable_;285,23777 -export MODULEPATH;291,23966 -_ModuleTable_=292,23985 -export _ModuleTable_;293,24310 -export __LMOD_REF_COUNT_INFOPATH;299,24534 -INFOPATH=300,24568 -export INFOPATH;301,24606 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=302,24623 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;303,24835 -LD_LIBRARY_PATH=304,24876 -export LD_LIBRARY_PATH;305,25057 -LMOD_FAMILY_COMPILER=306,25081 -export LMOD_FAMILY_COMPILER;307,25109 -LMOD_FAMILY_COMPILER_VERSION=308,25138 -export LMOD_FAMILY_COMPILER_VERSION;309,25174 -LMOD_FAMILY_MPI=310,25211 -export LMOD_FAMILY_MPI;311,25236 -LMOD_FAMILY_MPI_VERSION=312,25260 -export LMOD_FAMILY_MPI_VERSION;313,25291 -LOADEDMODULES=314,25323 -export LOADEDMODULES;315,25416 -__LMOD_REF_COUNT_MANPATH=316,25438 -export __LMOD_REF_COUNT_MANPATH;317,25686 -MANPATH=318,25719 -export MANPATH;319,25930 -MKL_DIR=320,25946 -export MKL_DIR;321,25988 -MKL_INCLUDE=322,26004 -export MKL_INCLUDE;323,26050 -__LMOD_REF_COUNT_MODULEPATH=324,26070 -export __LMOD_REF_COUNT_MODULEPATH;325,26230 -MODULEPATH=326,26266 -export MODULEPATH;327,26401 -MPIHOME=328,26420 -export MPIHOME;329,26473 -__LMOD_REF_COUNT_PATH=330,26489 -export __LMOD_REF_COUNT_PATH;331,26775 -PATH=332,26805 -export PATH;333,27048 -_LMFILES_=334,27061 -export _LMFILES_;335,27389 -_ModuleTable_=336,27407 -export _ModuleTable_;337,28916 -export MODULEPATH;343,29209 -_ModuleTable_=344,29228 -export _ModuleTable_;345,30737 -unset INFOPATH;351,30928 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;352,30944 -unset LD_LIBRARY_PATH;353,30984 -unset LMOD_FAMILY_COMPILER;354,31007 -unset LMOD_FAMILY_COMPILER_VERSION;355,31035 -unset LMOD_FAMILY_MPI;356,31071 -unset LMOD_FAMILY_MPI_VERSION;357,31094 -LOADEDMODULES=358,31125 -export LOADEDMODULES;359,31153 -unset __LMOD_REF_COUNT_MANPATH;360,31175 -unset MANPATH;361,31207 -unset MKL_DIR;362,31222 -unset MKL_INCLUDE;363,31237 -__LMOD_REF_COUNT_MODULEPATH=364,31256 -export __LMOD_REF_COUNT_MODULEPATH;365,31315 -MODULEPATH=366,31351 -export MODULEPATH;367,31391 -unset MPIHOME;368,31410 -__LMOD_REF_COUNT_PATH=369,31425 -export __LMOD_REF_COUNT_PATH;370,31485 -PATH=371,31515 -export PATH;372,31553 -unset TEST;373,31566 -_LMFILES_=374,31578 -export _LMFILES_;375,31630 -_ModuleTable_=376,31648 -export _ModuleTable_;377,31981 -export MODULEPATH;383,32170 -_ModuleTable_=384,32189 -export _ModuleTable_;385,32522 +export _ModuleTable_;48,4680 +export MODULEPATH;54,4963 +_ModuleTable_=55,4982 +export _ModuleTable_;56,6511 +unset INFOPATH;62,6709 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;63,6725 +unset LD_LIBRARY_PATH;64,6765 +unset LMOD_FAMILY_COMPILER;65,6788 +unset LMOD_FAMILY_COMPILER_VERSION;66,6816 +unset LMOD_FAMILY_MPI;67,6852 +unset LMOD_FAMILY_MPI_VERSION;68,6875 +unset LOADEDMODULES;69,6906 +unset __LMOD_REF_COUNT_MANPATH;70,6927 +unset MANPATH;71,6959 +unset MKL_DIR;72,6974 +unset MKL_INCLUDE;73,6989 +__LMOD_REF_COUNT_MODULEPATH=74,7008 +export __LMOD_REF_COUNT_MODULEPATH;75,7067 +MODULEPATH=76,7103 +export MODULEPATH;77,7143 +unset MPIHOME;78,7162 +__LMOD_REF_COUNT_PATH=79,7177 +export __LMOD_REF_COUNT_PATH;80,7237 +PATH=81,7267 +export PATH;82,7305 +unset _LMFILES_;83,7318 +_ModuleTable_=84,7335 +export _ModuleTable_;85,7493 +export MODULEPATH;91,7681 +_ModuleTable_=92,7700 +export _ModuleTable_;93,7858 +export ADMIN_MODULE_LOADED;99,8059 +__LMOD_REF_COUNT_INFOPATH=100,8087 +export __LMOD_REF_COUNT_INFOPATH;101,8147 +INFOPATH=102,8181 +export INFOPATH;103,8219 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=104,8236 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;105,8448 +LD_LIBRARY_PATH=106,8489 +export LD_LIBRARY_PATH;107,8670 +LMOD_FAMILY_COMPILER=108,8694 +export LMOD_FAMILY_COMPILER;109,8722 +LMOD_FAMILY_COMPILER_VERSION=110,8751 +export LMOD_FAMILY_COMPILER_VERSION;111,8787 +LMOD_FAMILY_MPI=112,8824 +export LMOD_FAMILY_MPI;113,8849 +LMOD_FAMILY_MPI_VERSION=114,8873 +export LMOD_FAMILY_MPI_VERSION;115,8904 +LOADEDMODULES=116,8936 +export LOADEDMODULES;117,9047 +__LMOD_REF_COUNT_MANPATH=118,9069 +export __LMOD_REF_COUNT_MANPATH;119,9317 +MANPATH=120,9350 +export MANPATH;121,9561 +MKL_DIR=122,9577 +export MKL_DIR;123,9619 +MKL_INCLUDE=124,9635 +export MKL_INCLUDE;125,9681 +__LMOD_REF_COUNT_MODULEPATH=126,9701 +export __LMOD_REF_COUNT_MODULEPATH;127,9861 +MODULEPATH=128,9897 +export MODULEPATH;129,10032 +MPIHOME=130,10051 +export MPIHOME;131,10104 +__LMOD_REF_COUNT_PATH=132,10120 +export __LMOD_REF_COUNT_PATH;133,10428 +PATH=134,10458 +export PATH;135,10717 +TACC_PMETIS_BIN=136,10730 +export TACC_PMETIS_BIN;137,10789 +TACC_PMETIS_DIR=138,10813 +export TACC_PMETIS_DIR;139,10872 +TACC_PMETIS_DOC=140,10896 +export TACC_PMETIS_DOC;141,10962 +TACC_PMETIS_INC=142,10986 +export TACC_PMETIS_INC;143,11045 +TACC_PMETIS_LIB=144,11069 +export TACC_PMETIS_LIB;145,11128 +_LMFILES_=146,11152 +export _LMFILES_;147,11554 +_ModuleTable_=148,11572 +export _ModuleTable_;149,13523 +export MODULEPATH;155,13806 +_ModuleTable_=156,13825 +export _ModuleTable_;157,15776 +unset __LMOD_REF_COUNT_INFOPATH;163,15952 +unset INFOPATH;164,15985 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;165,16001 +unset LD_LIBRARY_PATH;166,16041 +unset LMOD_FAMILY_COMPILER;167,16064 +unset LMOD_FAMILY_COMPILER_VERSION;168,16092 +unset LMOD_FAMILY_MPI;169,16128 +unset LMOD_FAMILY_MPI_VERSION;170,16151 +unset LOADEDMODULES;171,16182 +unset __LMOD_REF_COUNT_MANPATH;172,16203 +unset MANPATH;173,16235 +unset MKL_DIR;174,16250 +unset MKL_INCLUDE;175,16265 +__LMOD_REF_COUNT_MODULEPATH=176,16284 +export __LMOD_REF_COUNT_MODULEPATH;177,16343 +MODULEPATH=178,16379 +export MODULEPATH;179,16419 +unset MPIHOME;180,16438 +__LMOD_REF_COUNT_PATH=181,16453 +export __LMOD_REF_COUNT_PATH;182,16513 +PATH=183,16543 +export PATH;184,16581 +unset TACC_PMETIS_BIN;185,16594 +unset TACC_PMETIS_DIR;186,16617 +unset TACC_PMETIS_DOC;187,16640 +unset TACC_PMETIS_INC;188,16663 +unset TACC_PMETIS_LIB;189,16686 +unset _LMFILES_;190,16709 +_ModuleTable_=191,16726 +export _ModuleTable_;192,16884 +export MODULEPATH;198,17072 +_ModuleTable_=199,17091 +export _ModuleTable_;200,17249 +export __LMOD_REF_COUNT_INFOPATH;206,17473 +INFOPATH=207,17507 +export INFOPATH;208,17545 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=209,17562 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;210,17774 +LD_LIBRARY_PATH=211,17815 +export LD_LIBRARY_PATH;212,17996 +LMOD_FAMILY_COMPILER=213,18020 +export LMOD_FAMILY_COMPILER;214,18048 +LMOD_FAMILY_COMPILER_VERSION=215,18077 +export LMOD_FAMILY_COMPILER_VERSION;216,18113 +LMOD_FAMILY_MPI=217,18150 +export LMOD_FAMILY_MPI;218,18175 +LMOD_FAMILY_MPI_VERSION=219,18199 +export LMOD_FAMILY_MPI_VERSION;220,18230 +LOADEDMODULES=221,18262 +export LOADEDMODULES;222,18344 +__LMOD_REF_COUNT_MANPATH=223,18366 +export __LMOD_REF_COUNT_MANPATH;224,18614 +MANPATH=225,18647 +export MANPATH;226,18858 +MKL_DIR=227,18874 +export MKL_DIR;228,18916 +MKL_INCLUDE=229,18932 +export MKL_INCLUDE;230,18978 +__LMOD_REF_COUNT_MODULEPATH=231,18998 +export __LMOD_REF_COUNT_MODULEPATH;232,19158 +MODULEPATH=233,19194 +export MODULEPATH;234,19329 +MPIHOME=235,19348 +export MPIHOME;236,19401 +__LMOD_REF_COUNT_PATH=237,19417 +export __LMOD_REF_COUNT_PATH;238,19703 +PATH=239,19733 +export PATH;240,19976 +_LMFILES_=241,19989 +export _LMFILES_;242,20274 +_ModuleTable_=243,20292 +export _ModuleTable_;244,21821 +export MODULEPATH;250,22110 +_ModuleTable_=251,22129 +export _ModuleTable_;252,23658 +unset INFOPATH;258,23845 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;259,23861 +unset LD_LIBRARY_PATH;260,23901 +unset LMOD_FAMILY_COMPILER;261,23924 +unset LMOD_FAMILY_COMPILER_VERSION;262,23952 +unset LMOD_FAMILY_MPI;263,23988 +unset LMOD_FAMILY_MPI_VERSION;264,24011 +LOADEDMODULES=265,24042 +export LOADEDMODULES;266,24068 +unset __LMOD_REF_COUNT_MANPATH;267,24090 +unset MANPATH;268,24122 +unset MKL_DIR;269,24137 +unset MKL_INCLUDE;270,24152 +__LMOD_REF_COUNT_MODULEPATH=271,24171 +export __LMOD_REF_COUNT_MODULEPATH;272,24230 +MODULEPATH=273,24266 +export MODULEPATH;274,24306 +unset MPIHOME;275,24325 +__LMOD_REF_COUNT_PATH=276,24340 +export __LMOD_REF_COUNT_PATH;277,24400 +PATH=278,24430 +export PATH;279,24468 +TEST=280,24481 +export TEST;281,24489 +_LMFILES_=282,24502 +export _LMFILES_;283,24556 +_ModuleTable_=284,24574 +export _ModuleTable_;285,24899 +export MODULEPATH;291,25088 +_ModuleTable_=292,25107 +export _ModuleTable_;293,25432 +export __LMOD_REF_COUNT_INFOPATH;299,25656 +INFOPATH=300,25690 +export INFOPATH;301,25728 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=302,25745 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;303,25957 +LD_LIBRARY_PATH=304,25998 +export LD_LIBRARY_PATH;305,26179 +LMOD_FAMILY_COMPILER=306,26203 +export LMOD_FAMILY_COMPILER;307,26231 +LMOD_FAMILY_COMPILER_VERSION=308,26260 +export LMOD_FAMILY_COMPILER_VERSION;309,26296 +LMOD_FAMILY_MPI=310,26333 +export LMOD_FAMILY_MPI;311,26358 +LMOD_FAMILY_MPI_VERSION=312,26382 +export LMOD_FAMILY_MPI_VERSION;313,26413 +LOADEDMODULES=314,26445 +export LOADEDMODULES;315,26538 +__LMOD_REF_COUNT_MANPATH=316,26560 +export __LMOD_REF_COUNT_MANPATH;317,26808 +MANPATH=318,26841 +export MANPATH;319,27052 +MKL_DIR=320,27068 +export MKL_DIR;321,27110 +MKL_INCLUDE=322,27126 +export MKL_INCLUDE;323,27172 +__LMOD_REF_COUNT_MODULEPATH=324,27192 +export __LMOD_REF_COUNT_MODULEPATH;325,27352 +MODULEPATH=326,27388 +export MODULEPATH;327,27523 +MPIHOME=328,27542 +export MPIHOME;329,27595 +__LMOD_REF_COUNT_PATH=330,27611 +export __LMOD_REF_COUNT_PATH;331,27897 +PATH=332,27927 +export PATH;333,28170 +_LMFILES_=334,28183 +export _LMFILES_;335,28511 +_ModuleTable_=336,28529 +export _ModuleTable_;337,30225 +export MODULEPATH;343,30518 +_ModuleTable_=344,30537 +export _ModuleTable_;345,32233 +unset INFOPATH;351,32424 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;352,32440 +unset LD_LIBRARY_PATH;353,32480 +unset LMOD_FAMILY_COMPILER;354,32503 +unset LMOD_FAMILY_COMPILER_VERSION;355,32531 +unset LMOD_FAMILY_MPI;356,32567 +unset LMOD_FAMILY_MPI_VERSION;357,32590 +LOADEDMODULES=358,32621 +export LOADEDMODULES;359,32649 +unset __LMOD_REF_COUNT_MANPATH;360,32671 +unset MANPATH;361,32703 +unset MKL_DIR;362,32718 +unset MKL_INCLUDE;363,32733 +__LMOD_REF_COUNT_MODULEPATH=364,32752 +export __LMOD_REF_COUNT_MODULEPATH;365,32811 +MODULEPATH=366,32847 +export MODULEPATH;367,32887 +unset MPIHOME;368,32906 +__LMOD_REF_COUNT_PATH=369,32921 +export __LMOD_REF_COUNT_PATH;370,32981 +PATH=371,33011 +export PATH;372,33049 +unset TEST;373,33062 +_LMFILES_=374,33074 +export _LMFILES_;375,33126 +_ModuleTable_=376,33144 +export _ModuleTable_;377,33477 +export MODULEPATH;383,33666 +_ModuleTable_=384,33685 +export _ModuleTable_;385,34018 rt/uitSitePkg/uitSitePkg.tdesc,21 local testName 2,15 @@ -10755,38 +10879,38 @@ export PATH;34,1583 _LMFILES_=35,1596 export _LMFILES_;36,1704 _ModuleTable_=37,1722 -export _ModuleTable_;38,2342 -export MODULEPATH;44,2582 -_ModuleTable_=45,2601 -export _ModuleTable_;46,3221 -export MODULEPATH;52,3469 -_ModuleTable_=53,3488 -export _ModuleTable_;54,4108 -export LD_LIBRARY_PATH;60,4335 -LIBRARY_PATH=61,4359 -export LIBRARY_PATH;62,4402 -LMOD_FAMILY_COMPILER=63,4423 -export LMOD_FAMILY_COMPILER;64,4449 -LMOD_FAMILY_COMPILER_VERSION=65,4478 -export LMOD_FAMILY_COMPILER_VERSION;66,4514 -MANPATH=67,4551 -export MANPATH;68,4623 -MODULEPATH=69,4639 -export MODULEPATH;70,4731 -PATH=71,4750 -export PATH;72,4845 -_ModuleTable_=73,4858 -export _ModuleTable_;74,5478 -__LMOD_DEFAULT_MODULES_LOADED__=75,5500 -export __LMOD_DEFAULT_MODULES_LOADED__;76,5535 -export MODULEPATH;82,5795 -_ModuleTable_=83,5814 -export _ModuleTable_;84,6434 -export MODULEPATH;90,6683 -_ModuleTable_=91,6702 -export _ModuleTable_;92,7322 - -rt/inherit/out.txt,6593 +export _ModuleTable_;38,2435 +export MODULEPATH;44,2675 +_ModuleTable_=45,2694 +export _ModuleTable_;46,3407 +export MODULEPATH;52,3655 +_ModuleTable_=53,3674 +export _ModuleTable_;54,4387 +export LD_LIBRARY_PATH;60,4614 +LIBRARY_PATH=61,4638 +export LIBRARY_PATH;62,4681 +LMOD_FAMILY_COMPILER=63,4702 +export LMOD_FAMILY_COMPILER;64,4728 +LMOD_FAMILY_COMPILER_VERSION=65,4757 +export LMOD_FAMILY_COMPILER_VERSION;66,4793 +MANPATH=67,4830 +export MANPATH;68,4902 +MODULEPATH=69,4918 +export MODULEPATH;70,5010 +PATH=71,5029 +export PATH;72,5124 +_ModuleTable_=73,5137 +export _ModuleTable_;74,5850 +__LMOD_DEFAULT_MODULES_LOADED__=75,5872 +export __LMOD_DEFAULT_MODULES_LOADED__;76,5907 +export MODULEPATH;82,6167 +_ModuleTable_=83,6186 +export _ModuleTable_;84,6899 +export MODULEPATH;90,7148 +_ModuleTable_=91,7167 +export _ModuleTable_;92,7880 + +rt/inherit/out.txt,6597 export __LMOD_REF_COUNT_MODULEPATH;10,480 MODULEPATH=11,516 export MODULEPATH;12,620 @@ -10837,179 +10961,179 @@ export PERSONAL_intel;86,5046 _LMFILES_=87,5069 export _LMFILES_;88,5128 _ModuleTable_=89,5146 -export _ModuleTable_;90,5784 -export LMOD_FAMILY_MPI;96,5961 -LMOD_FAMILY_MPI_VERSION=97,5985 -export LMOD_FAMILY_MPI_VERSION;98,6016 -LMOD_MPICH_BIN=99,6048 -export LMOD_MPICH_BIN;100,6101 -LMOD_MPICH_DIR=101,6124 -export LMOD_MPICH_DIR;102,6173 -LMOD_MPICH_LIB=103,6196 -export LMOD_MPICH_LIB;104,6249 -LMOD_MPICH_MAN=105,6272 -export LMOD_MPICH_MAN;106,6325 -LOADEDMODULES=107,6348 -export LOADEDMODULES;108,6388 -__LMOD_REF_COUNT_MANPATH=109,6410 -export __LMOD_REF_COUNT_MANPATH;110,6475 -MANPATH=111,6508 -export MANPATH;112,6554 -__LMOD_REF_COUNT_MODULEPATH=113,6570 -export __LMOD_REF_COUNT_MODULEPATH;114,6937 -MODULEPATH=115,6973 -export MODULEPATH;116,7300 -MPICH_HOME=117,7319 -export MPICH_HOME;118,7364 -__LMOD_REF_COUNT_PATH=119,7383 -export __LMOD_REF_COUNT_PATH;120,7483 -PATH=121,7513 -export PATH;122,7588 -PERSONAL_mpich=123,7601 -export PERSONAL_mpich;124,7623 -_LMFILES_=125,7646 -export _LMFILES_;126,7767 -_ModuleTable_=127,7785 -export _ModuleTable_;128,8878 -export LOADEDMODULES;134,9083 -MODULEPATH=135,9105 -export MODULEPATH;136,9432 -P4EST_DIR=137,9451 -export P4EST_DIR;138,9522 -_LMFILES_=139,9540 -export _LMFILES_;140,9726 -_ModuleTable_=141,9744 -export _ModuleTable_;142,11027 -export MODULEPATH;148,11503 -_ModuleTable_=149,11522 -export _ModuleTable_;150,12805 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;156,13023 -LD_LIBRARY_PATH=157,13064 -export LD_LIBRARY_PATH;158,13097 -LMOD_FAMILY_MPI=159,13121 -export LMOD_FAMILY_MPI;160,13146 -LMOD_FAMILY_MPI_VERSION=161,13170 -export LMOD_FAMILY_MPI_VERSION;162,13201 -unset LMOD_MPICH_BIN;163,13233 -unset LMOD_MPICH_DIR;164,13255 -unset LMOD_MPICH_LIB;165,13277 -unset LMOD_MPICH_MAN;166,13299 -LMOD_OPENMPI_BIN=167,13321 -export LMOD_OPENMPI_BIN;168,13378 -LMOD_OPENMPI_DIR=169,13403 -export LMOD_OPENMPI_DIR;170,13456 -LMOD_OPENMPI_LIB=171,13481 -export LMOD_OPENMPI_LIB;172,13538 -LMOD_OPENMPI_MAN=173,13563 -export LMOD_OPENMPI_MAN;174,13620 -LOADEDMODULES=175,13645 -export LOADEDMODULES;176,13697 -__LMOD_REF_COUNT_MANPATH=177,13719 -export __LMOD_REF_COUNT_MANPATH;178,13793 -MANPATH=179,13826 -export MANPATH;180,13878 -__LMOD_REF_COUNT_MODULEPATH=181,13894 -export __LMOD_REF_COUNT_MODULEPATH;182,14265 -MODULEPATH=183,14301 -export MODULEPATH;184,14632 -MPICH_HOME=185,14651 -export MPICH_HOME;186,14698 -MPIHOME=187,14717 -export MPIHOME;188,14761 -P4EST_DIR=189,14777 -export P4EST_DIR;190,14850 -__LMOD_REF_COUNT_PATH=191,14868 -export __LMOD_REF_COUNT_PATH;192,14970 -PATH=193,15000 -export PATH;194,15077 -unset PERSONAL_mpich;195,15090 -PERSONAL_openmpi=196,15112 -export PERSONAL_openmpi;197,15136 -_LMFILES_=198,15161 -export _LMFILES_;199,15351 -_ModuleTable_=200,15369 -export _ModuleTable_;201,16674 -export GCC;207,16844 -unset INTEL;208,16856 -LD_LIBRARY_PATH=209,16869 -export LD_LIBRARY_PATH;210,16902 -LMOD_FAMILY_COMPILER=211,16926 -export LMOD_FAMILY_COMPILER;212,16952 -LMOD_FAMILY_COMPILER_VERSION=213,16981 -export LMOD_FAMILY_COMPILER_VERSION;214,17017 -LMOD_FAMILY_MPI=215,17054 -export LMOD_FAMILY_MPI;216,17079 -LMOD_FAMILY_MPI_VERSION=217,17103 -export LMOD_FAMILY_MPI_VERSION;218,17134 -LMOD_OPENMPI_BIN=219,17166 -export LMOD_OPENMPI_BIN;220,17220 -LMOD_OPENMPI_DIR=221,17245 -export LMOD_OPENMPI_DIR;222,17295 -LMOD_OPENMPI_LIB=223,17320 -export LMOD_OPENMPI_LIB;224,17374 -LMOD_OPENMPI_MAN=225,17399 -export LMOD_OPENMPI_MAN;226,17453 -LOADEDMODULES=227,17478 -export LOADEDMODULES;228,17527 -__LMOD_REF_COUNT_MANPATH=229,17549 -export __LMOD_REF_COUNT_MANPATH;230,17620 -MANPATH=231,17653 -export MANPATH;232,17702 -__LMOD_REF_COUNT_MODULEPATH=233,17718 -export __LMOD_REF_COUNT_MODULEPATH;234,18077 -MODULEPATH=235,18113 -export MODULEPATH;236,18432 -MPICH_HOME=237,18451 -export MPICH_HOME;238,18495 -MPIHOME=239,18514 -export MPIHOME;240,18555 -P4EST_DIR=241,18571 -export P4EST_DIR;242,18641 -__LMOD_REF_COUNT_PATH=243,18659 -export __LMOD_REF_COUNT_PATH;244,18758 -PATH=245,18788 -export PATH;246,18862 -PERSONAL_gcc=247,18875 -export PERSONAL_gcc;248,18895 -unset PERSONAL_intel;249,18916 -PERSONAL_openmpi=250,18938 -export PERSONAL_openmpi;251,18962 -_LMFILES_=252,18987 -export _LMFILES_;253,19168 -_ModuleTable_=254,19186 -export _ModuleTable_;255,20449 -export MODULEPATH;261,20917 -_ModuleTable_=262,20936 -export _ModuleTable_;263,22199 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;269,22360 -unset LD_LIBRARY_PATH;270,22400 -unset LMOD_FAMILY_COMPILER;271,22423 -unset LMOD_FAMILY_COMPILER_VERSION;272,22451 -unset LMOD_FAMILY_MPI;273,22487 -unset LMOD_FAMILY_MPI_VERSION;274,22510 -unset LMOD_OPENMPI_BIN;275,22541 -unset LMOD_OPENMPI_DIR;276,22565 -unset LMOD_OPENMPI_LIB;277,22589 -unset LMOD_OPENMPI_MAN;278,22613 -unset LOADEDMODULES;279,22637 -unset __LMOD_REF_COUNT_MANPATH;280,22658 -unset MANPATH;281,22690 -__LMOD_REF_COUNT_MODULEPATH=282,22705 -export __LMOD_REF_COUNT_MODULEPATH;283,22868 -MODULEPATH=284,22904 -export MODULEPATH;285,23039 -unset MPICH_HOME;286,23058 -unset MPIHOME;287,23076 -unset P4EST_DIR;288,23091 -__LMOD_REF_COUNT_PATH=289,23108 -export __LMOD_REF_COUNT_PATH;290,23168 -PATH=291,23198 -export PATH;292,23236 -unset PERSONAL_gcc;293,23249 -unset PERSONAL_openmpi;294,23269 -unset _LMFILES_;295,23293 -_ModuleTable_=296,23310 -export _ModuleTable_;297,23523 +export _ModuleTable_;90,5956 +export LMOD_FAMILY_MPI;96,6133 +LMOD_FAMILY_MPI_VERSION=97,6157 +export LMOD_FAMILY_MPI_VERSION;98,6188 +LMOD_MPICH_BIN=99,6220 +export LMOD_MPICH_BIN;100,6273 +LMOD_MPICH_DIR=101,6296 +export LMOD_MPICH_DIR;102,6345 +LMOD_MPICH_LIB=103,6368 +export LMOD_MPICH_LIB;104,6421 +LMOD_MPICH_MAN=105,6444 +export LMOD_MPICH_MAN;106,6497 +LOADEDMODULES=107,6520 +export LOADEDMODULES;108,6560 +__LMOD_REF_COUNT_MANPATH=109,6582 +export __LMOD_REF_COUNT_MANPATH;110,6647 +MANPATH=111,6680 +export MANPATH;112,6726 +__LMOD_REF_COUNT_MODULEPATH=113,6742 +export __LMOD_REF_COUNT_MODULEPATH;114,7109 +MODULEPATH=115,7145 +export MODULEPATH;116,7472 +MPICH_HOME=117,7491 +export MPICH_HOME;118,7536 +__LMOD_REF_COUNT_PATH=119,7555 +export __LMOD_REF_COUNT_PATH;120,7655 +PATH=121,7685 +export PATH;122,7760 +PERSONAL_mpich=123,7773 +export PERSONAL_mpich;124,7795 +_LMFILES_=125,7818 +export _LMFILES_;126,7939 +_ModuleTable_=127,7957 +export _ModuleTable_;128,9404 +export LOADEDMODULES;134,9609 +MODULEPATH=135,9631 +export MODULEPATH;136,9958 +P4EST_DIR=137,9977 +export P4EST_DIR;138,10048 +_LMFILES_=139,10066 +export _LMFILES_;140,10252 +_ModuleTable_=141,10270 +export _ModuleTable_;142,11907 +export MODULEPATH;148,12383 +_ModuleTable_=149,12402 +export _ModuleTable_;150,14039 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;156,14257 +LD_LIBRARY_PATH=157,14298 +export LD_LIBRARY_PATH;158,14331 +LMOD_FAMILY_MPI=159,14355 +export LMOD_FAMILY_MPI;160,14380 +LMOD_FAMILY_MPI_VERSION=161,14404 +export LMOD_FAMILY_MPI_VERSION;162,14435 +unset LMOD_MPICH_BIN;163,14467 +unset LMOD_MPICH_DIR;164,14489 +unset LMOD_MPICH_LIB;165,14511 +unset LMOD_MPICH_MAN;166,14533 +LMOD_OPENMPI_BIN=167,14555 +export LMOD_OPENMPI_BIN;168,14612 +LMOD_OPENMPI_DIR=169,14637 +export LMOD_OPENMPI_DIR;170,14690 +LMOD_OPENMPI_LIB=171,14715 +export LMOD_OPENMPI_LIB;172,14772 +LMOD_OPENMPI_MAN=173,14797 +export LMOD_OPENMPI_MAN;174,14854 +LOADEDMODULES=175,14879 +export LOADEDMODULES;176,14931 +__LMOD_REF_COUNT_MANPATH=177,14953 +export __LMOD_REF_COUNT_MANPATH;178,15027 +MANPATH=179,15060 +export MANPATH;180,15112 +__LMOD_REF_COUNT_MODULEPATH=181,15128 +export __LMOD_REF_COUNT_MODULEPATH;182,15499 +MODULEPATH=183,15535 +export MODULEPATH;184,15866 +MPICH_HOME=185,15885 +export MPICH_HOME;186,15932 +MPIHOME=187,15951 +export MPIHOME;188,15995 +P4EST_DIR=189,16011 +export P4EST_DIR;190,16084 +__LMOD_REF_COUNT_PATH=191,16102 +export __LMOD_REF_COUNT_PATH;192,16204 +PATH=193,16234 +export PATH;194,16311 +unset PERSONAL_mpich;195,16324 +PERSONAL_openmpi=196,16346 +export PERSONAL_openmpi;197,16370 +_LMFILES_=198,16395 +export _LMFILES_;199,16585 +_ModuleTable_=200,16603 +export _ModuleTable_;201,18266 +export GCC;207,18436 +unset INTEL;208,18448 +LD_LIBRARY_PATH=209,18461 +export LD_LIBRARY_PATH;210,18494 +LMOD_FAMILY_COMPILER=211,18518 +export LMOD_FAMILY_COMPILER;212,18544 +LMOD_FAMILY_COMPILER_VERSION=213,18573 +export LMOD_FAMILY_COMPILER_VERSION;214,18609 +LMOD_FAMILY_MPI=215,18646 +export LMOD_FAMILY_MPI;216,18671 +LMOD_FAMILY_MPI_VERSION=217,18695 +export LMOD_FAMILY_MPI_VERSION;218,18726 +LMOD_OPENMPI_BIN=219,18758 +export LMOD_OPENMPI_BIN;220,18812 +LMOD_OPENMPI_DIR=221,18837 +export LMOD_OPENMPI_DIR;222,18887 +LMOD_OPENMPI_LIB=223,18912 +export LMOD_OPENMPI_LIB;224,18966 +LMOD_OPENMPI_MAN=225,18991 +export LMOD_OPENMPI_MAN;226,19045 +LOADEDMODULES=227,19070 +export LOADEDMODULES;228,19119 +__LMOD_REF_COUNT_MANPATH=229,19141 +export __LMOD_REF_COUNT_MANPATH;230,19212 +MANPATH=231,19245 +export MANPATH;232,19294 +__LMOD_REF_COUNT_MODULEPATH=233,19310 +export __LMOD_REF_COUNT_MODULEPATH;234,19669 +MODULEPATH=235,19705 +export MODULEPATH;236,20024 +MPICH_HOME=237,20043 +export MPICH_HOME;238,20087 +MPIHOME=239,20106 +export MPIHOME;240,20147 +P4EST_DIR=241,20163 +export P4EST_DIR;242,20233 +__LMOD_REF_COUNT_PATH=243,20251 +export __LMOD_REF_COUNT_PATH;244,20350 +PATH=245,20380 +export PATH;246,20454 +PERSONAL_gcc=247,20467 +export PERSONAL_gcc;248,20487 +unset PERSONAL_intel;249,20508 +PERSONAL_openmpi=250,20530 +export PERSONAL_openmpi;251,20554 +_LMFILES_=252,20579 +export _LMFILES_;253,20760 +_ModuleTable_=254,20778 +export _ModuleTable_;255,22387 +export MODULEPATH;261,22855 +_ModuleTable_=262,22874 +export _ModuleTable_;263,24483 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;269,24644 +unset LD_LIBRARY_PATH;270,24684 +unset LMOD_FAMILY_COMPILER;271,24707 +unset LMOD_FAMILY_COMPILER_VERSION;272,24735 +unset LMOD_FAMILY_MPI;273,24771 +unset LMOD_FAMILY_MPI_VERSION;274,24794 +unset LMOD_OPENMPI_BIN;275,24825 +unset LMOD_OPENMPI_DIR;276,24849 +unset LMOD_OPENMPI_LIB;277,24873 +unset LMOD_OPENMPI_MAN;278,24897 +unset LOADEDMODULES;279,24921 +unset __LMOD_REF_COUNT_MANPATH;280,24942 +unset MANPATH;281,24974 +__LMOD_REF_COUNT_MODULEPATH=282,24989 +export __LMOD_REF_COUNT_MODULEPATH;283,25152 +MODULEPATH=284,25188 +export MODULEPATH;285,25323 +unset MPICH_HOME;286,25342 +unset MPIHOME;287,25360 +unset P4EST_DIR;288,25375 +__LMOD_REF_COUNT_PATH=289,25392 +export __LMOD_REF_COUNT_PATH;290,25452 +PATH=291,25482 +export PATH;292,25520 +unset PERSONAL_gcc;293,25533 +unset PERSONAL_openmpi;294,25553 +unset _LMFILES_;295,25577 +_ModuleTable_=296,25594 +export _ModuleTable_;297,25807 rt/inherit/inherit.tdesc,19 testdescript 2,15 @@ -11342,61 +11466,61 @@ export MODULEPATH;14,476 _LMFILES_=15,495 export _LMFILES_;16,568 _ModuleTable_=17,586 -export _ModuleTable_;18,1062 -openfoam=19,1084 -export openfoam;20,1107 -__LMOD_REF_COUNT_MODULEPATH=26,1272 -export __LMOD_REF_COUNT_MODULEPATH;27,1321 -MODULEPATH=28,1357 -export MODULEPATH;29,1387 -unset _LMFILES_;30,1406 -_ModuleTable_=31,1423 -export _ModuleTable_;32,1561 -unset openfoam;33,1583 -export LOADEDMODULES;39,1748 -ME=40,1770 -export ME;41,1780 -MODULEPATH=42,1791 -export MODULEPATH;43,1821 -_LMFILES_=44,1840 -export _LMFILES_;45,1879 -_ModuleTable_=46,1897 -export _ModuleTable_;47,2176 -export LOADEDMODULES;53,2353 -ME=54,2375 -export ME;55,2385 -MODULEPATH=56,2396 -export MODULEPATH;57,2426 -_LMFILES_=58,2445 -export _LMFILES_;59,2512 -_ModuleTable_=60,2530 -export _ModuleTable_;61,2950 -export MODULEPATH;67,3128 -_ModuleTable_=68,3147 -export _ModuleTable_;69,3567 -export LOADEDMODULES;75,3740 -unset ME;76,3762 -MODULEPATH=77,3772 -export MODULEPATH;78,3802 -_LMFILES_=79,3821 -export _LMFILES_;80,3860 -_ModuleTable_=81,3878 -export _ModuleTable_;82,4157 -export MODULEPATH;93,4469 -_ModuleTable_=94,4488 -export _ModuleTable_;95,4767 -export LOADEDMODULES;101,4945 -ME=102,4967 -export ME;103,4977 -MODULEPATH=104,4988 -export MODULEPATH;105,5018 -_LMFILES_=106,5037 -export _LMFILES_;107,5104 -_ModuleTable_=108,5122 -export _ModuleTable_;109,5542 -export MODULEPATH;115,5721 -_ModuleTable_=116,5740 -export _ModuleTable_;117,6160 +export _ModuleTable_;18,1125 +openfoam=19,1147 +export openfoam;20,1170 +__LMOD_REF_COUNT_MODULEPATH=26,1335 +export __LMOD_REF_COUNT_MODULEPATH;27,1384 +MODULEPATH=28,1420 +export MODULEPATH;29,1450 +unset _LMFILES_;30,1469 +_ModuleTable_=31,1486 +export _ModuleTable_;32,1624 +unset openfoam;33,1646 +export LOADEDMODULES;39,1811 +ME=40,1833 +export ME;41,1843 +MODULEPATH=42,1854 +export MODULEPATH;43,1884 +_LMFILES_=44,1903 +export _LMFILES_;45,1942 +_ModuleTable_=46,1960 +export _ModuleTable_;47,2239 +export LOADEDMODULES;53,2416 +ME=54,2438 +export ME;55,2448 +MODULEPATH=56,2459 +export MODULEPATH;57,2489 +_LMFILES_=58,2508 +export _LMFILES_;59,2575 +_ModuleTable_=60,2593 +export _ModuleTable_;61,3013 +export MODULEPATH;67,3191 +_ModuleTable_=68,3210 +export _ModuleTable_;69,3630 +export LOADEDMODULES;75,3803 +unset ME;76,3825 +MODULEPATH=77,3835 +export MODULEPATH;78,3865 +_LMFILES_=79,3884 +export _LMFILES_;80,3923 +_ModuleTable_=81,3941 +export _ModuleTable_;82,4220 +export MODULEPATH;93,4532 +_ModuleTable_=94,4551 +export _ModuleTable_;95,4830 +export LOADEDMODULES;101,5008 +ME=102,5030 +export ME;103,5040 +MODULEPATH=104,5051 +export MODULEPATH;105,5081 +_LMFILES_=106,5100 +export _LMFILES_;107,5167 +_ModuleTable_=108,5185 +export _ModuleTable_;109,5605 +export MODULEPATH;115,5784 +_ModuleTable_=116,5803 +export _ModuleTable_;117,6223 rt/cached_loads/err.txt,97 Also make sure that all modulefiles written in TCL start with the string #%ModuleModule41,1447 @@ -11554,43 +11678,43 @@ export MODULEPATH;24,906 _LMFILES_=25,925 export _LMFILES_;26,1036 _ModuleTable_=27,1054 -export _ModuleTable_;28,1720 -export GCC;34,1891 -LMOD_FAMILY_COMPILER=35,1903 -export LMOD_FAMILY_COMPILER;36,1929 -LMOD_FAMILY_COMPILER_VERSION=37,1958 -export LMOD_FAMILY_COMPILER_VERSION;38,1992 -LMOD_FAMILY_MPI=39,2029 -export LMOD_FAMILY_MPI;40,2051 -LMOD_FAMILY_MPI_VERSION=41,2075 -export LMOD_FAMILY_MPI_VERSION;42,2107 -LOADEDMODULES=43,2139 -export LOADEDMODULES;44,2185 -__LMOD_REF_COUNT_MODULEPATH=45,2207 -export __LMOD_REF_COUNT_MODULEPATH;46,2351 -MODULEPATH=47,2387 -export MODULEPATH;48,2506 -_LMFILES_=49,2525 -export _LMFILES_;50,2686 -_ModuleTable_=51,2704 -export _ModuleTable_;52,3521 -fenics=53,3543 -export fenics;54,3555 -export GCC;60,3716 -LMOD_FAMILY_COMPILER=61,3728 -export LMOD_FAMILY_COMPILER;62,3754 -LMOD_FAMILY_COMPILER_VERSION=63,3783 -export LMOD_FAMILY_COMPILER_VERSION;64,3817 -LMOD_FAMILY_MPI=65,3854 -export LMOD_FAMILY_MPI;66,3876 -LMOD_FAMILY_MPI_VERSION=67,3900 -export LMOD_FAMILY_MPI_VERSION;68,3932 -MODULEPATH=69,3964 -export MODULEPATH;70,4083 -_ModuleTable_=71,4102 -export _ModuleTable_;72,4919 -fenics=73,4941 -export fenics;74,4953 +export _ModuleTable_;28,1899 +export GCC;34,2070 +LMOD_FAMILY_COMPILER=35,2082 +export LMOD_FAMILY_COMPILER;36,2108 +LMOD_FAMILY_COMPILER_VERSION=37,2137 +export LMOD_FAMILY_COMPILER_VERSION;38,2171 +LMOD_FAMILY_MPI=39,2208 +export LMOD_FAMILY_MPI;40,2230 +LMOD_FAMILY_MPI_VERSION=41,2254 +export LMOD_FAMILY_MPI_VERSION;42,2286 +LOADEDMODULES=43,2318 +export LOADEDMODULES;44,2364 +__LMOD_REF_COUNT_MODULEPATH=45,2386 +export __LMOD_REF_COUNT_MODULEPATH;46,2530 +MODULEPATH=47,2566 +export MODULEPATH;48,2685 +_LMFILES_=49,2704 +export _LMFILES_;50,2865 +_ModuleTable_=51,2883 +export _ModuleTable_;52,3873 +fenics=53,3895 +export fenics;54,3907 +export GCC;60,4068 +LMOD_FAMILY_COMPILER=61,4080 +export LMOD_FAMILY_COMPILER;62,4106 +LMOD_FAMILY_COMPILER_VERSION=63,4135 +export LMOD_FAMILY_COMPILER_VERSION;64,4169 +LMOD_FAMILY_MPI=65,4206 +export LMOD_FAMILY_MPI;66,4228 +LMOD_FAMILY_MPI_VERSION=67,4252 +export LMOD_FAMILY_MPI_VERSION;68,4284 +MODULEPATH=69,4316 +export MODULEPATH;70,4435 +_ModuleTable_=71,4454 +export _ModuleTable_;72,5444 +fenics=73,5466 +export fenics;74,5478 rt/dyn/dyn.tdesc,21 local testName 2,15 @@ -11645,7 +11769,7 @@ export MODULEPATH;36,1495 _ModuleTable_=37,1514 export _ModuleTable_;38,1672 -rt/hierarchy/out.txt,9339 +rt/hierarchy/out.txt,9340 export LOADEDMODULES;10,292 __LMOD_REF_COUNT_MODULEPATH=11,314 export __LMOD_REF_COUNT_MODULEPATH;12,377 @@ -11678,280 +11802,280 @@ export MY_VERSION;48,2253 _LMFILES_=49,2272 export _LMFILES_;50,2449 _ModuleTable_=51,2467 -export _ModuleTable_;52,3277 -export MODULEPATH;58,3513 -_ModuleTable_=59,3532 -export _ModuleTable_;60,4342 -unset COMPILER_DEPENDENT;66,4517 -unset LMOD_FAMILY_COMPILER;67,4543 -unset LMOD_FAMILY_COMPILER_VERSION;68,4571 -LOADEDMODULES=69,4607 -export LOADEDMODULES;70,4635 -__LMOD_REF_COUNT_MODULEPATH=71,4657 -export __LMOD_REF_COUNT_MODULEPATH;72,4720 -MODULEPATH=73,4756 -export MODULEPATH;74,4800 -MY_VERSION=75,4819 -export MY_VERSION;76,4837 -_LMFILES_=77,4856 -export _LMFILES_;78,4916 -_ModuleTable_=79,4934 -export _ModuleTable_;80,5501 -export MODULEPATH;86,5693 -_ModuleTable_=87,5712 -export _ModuleTable_;88,6279 -export MODULEPATH;94,6479 -_ModuleTable_=95,6498 -export _ModuleTable_;96,6863 -export COMPILER_DEPENDENT;102,7050 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=103,7077 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;104,7132 -LD_LIBRARY_PATH=105,7173 -export LD_LIBRARY_PATH;106,7206 -LMOD_FAMILY_COMPILER=107,7230 -export LMOD_FAMILY_COMPILER;108,7256 -LMOD_FAMILY_COMPILER_VERSION=109,7285 -export LMOD_FAMILY_COMPILER_VERSION;110,7319 -LMOD_FAMILY_MPI=111,7356 -export LMOD_FAMILY_MPI;112,7378 -LMOD_FAMILY_MPI_VERSION=113,7402 -export LMOD_FAMILY_MPI_VERSION;114,7434 -LOADEDMODULES=115,7466 -export LOADEDMODULES;116,7524 -__LMOD_REF_COUNT_MANPATH=117,7546 -export __LMOD_REF_COUNT_MANPATH;118,7608 -MANPATH=119,7641 -export MANPATH;120,7684 -__LMOD_REF_COUNT_MODULEPATH=121,7700 -export __LMOD_REF_COUNT_MODULEPATH;122,7862 -MODULEPATH=123,7898 -export MODULEPATH;124,8035 -MPICH_HOME=125,8054 -export MPICH_HOME;126,8096 -MPIHOME=127,8115 -export MPIHOME;128,8154 -MY_VERSION=129,8170 -export MY_VERSION;130,8188 -TACC_IMPI_BIN=131,8207 -export TACC_IMPI_BIN;132,8256 -TACC_IMPI_DIR=133,8278 -export TACC_IMPI_DIR;134,8323 -TACC_IMPI_INC=135,8345 -export TACC_IMPI_INC;136,8398 -TACC_IMPI_LIB=137,8420 -export TACC_IMPI_LIB;138,8469 -_LMFILES_=139,8491 -export _LMFILES_;140,8730 -_ModuleTable_=141,8748 -export _ModuleTable_;142,9824 -export MODULEPATH;148,10111 -_ModuleTable_=149,10130 -export _ModuleTable_;150,11206 -LD_LIBRARY_PATH=156,11393 -export LD_LIBRARY_PATH;157,11426 -LMOD_FAMILY_COMPILER=158,11450 -export LMOD_FAMILY_COMPILER;159,11478 -LMOD_FAMILY_COMPILER_VERSION=160,11507 -export LMOD_FAMILY_COMPILER_VERSION;161,11544 -LMOD_FAMILY_MPI=162,11581 -export LMOD_FAMILY_MPI;163,11603 -LMOD_FAMILY_MPI_VERSION=164,11627 -export LMOD_FAMILY_MPI_VERSION;165,11659 -LOADEDMODULES=166,11691 -export LOADEDMODULES;167,11754 -__LMOD_REF_COUNT_MANPATH=168,11776 -export __LMOD_REF_COUNT_MANPATH;169,11841 -MANPATH=170,11874 -export MANPATH;171,11920 -__LMOD_REF_COUNT_MODULEPATH=172,11936 -export __LMOD_REF_COUNT_MODULEPATH;173,12104 -MODULEPATH=174,12140 -export MODULEPATH;175,12283 -MPICH_HOME=176,12302 -export MPICH_HOME;177,12347 -MPIHOME=178,12366 -export MPIHOME;179,12408 -MY_VERSION=180,12424 -export MY_VERSION;181,12442 -TACC_IMPI_BIN=182,12461 -export TACC_IMPI_BIN;183,12513 -TACC_IMPI_DIR=184,12535 -export TACC_IMPI_DIR;185,12583 -TACC_IMPI_INC=186,12605 -export TACC_IMPI_INC;187,12661 -TACC_IMPI_LIB=188,12683 -export TACC_IMPI_LIB;189,12735 -_LMFILES_=190,12757 -export _LMFILES_;191,12995 -_ModuleTable_=192,13013 -export _ModuleTable_;193,14115 -export MODULEPATH;199,14408 -_ModuleTable_=200,14427 -export _ModuleTable_;201,15529 -unset LD_LIBRARY_PATH;207,15719 -unset LMOD_FAMILY_COMPILER;208,15742 -unset LMOD_FAMILY_COMPILER_VERSION;209,15770 -unset LMOD_FAMILY_MPI;210,15806 -unset LMOD_FAMILY_MPI_VERSION;211,15829 -unset LOADEDMODULES;212,15860 -unset __LMOD_REF_COUNT_MANPATH;213,15881 -unset MANPATH;214,15913 -__LMOD_REF_COUNT_MODULEPATH=215,15928 -export __LMOD_REF_COUNT_MODULEPATH;216,15991 -MODULEPATH=217,16027 -export MODULEPATH;218,16071 -unset MPICH_HOME;219,16090 -unset MPIHOME;220,16108 -unset MY_VERSION;221,16123 -unset TACC_IMPI_BIN;222,16141 -unset TACC_IMPI_DIR;223,16162 -unset TACC_IMPI_INC;224,16183 -unset TACC_IMPI_LIB;225,16204 -unset _LMFILES_;226,16225 -_ModuleTable_=227,16242 -export _ModuleTable_;228,16408 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;234,16627 -LD_LIBRARY_PATH=235,16668 -export LD_LIBRARY_PATH;236,16701 -LMOD_FAMILY_COMPILER=237,16725 -export LMOD_FAMILY_COMPILER;238,16751 -LMOD_FAMILY_COMPILER_VERSION=239,16780 -export LMOD_FAMILY_COMPILER_VERSION;240,16814 -LMOD_FAMILY_MPI=241,16851 -export LMOD_FAMILY_MPI;242,16873 -LMOD_FAMILY_MPI_VERSION=243,16897 -export LMOD_FAMILY_MPI_VERSION;244,16929 -LOADEDMODULES=245,16961 -export LOADEDMODULES;246,17006 -__LMOD_REF_COUNT_MANPATH=247,17028 -export __LMOD_REF_COUNT_MANPATH;248,17090 -MANPATH=249,17123 -export MANPATH;250,17166 -__LMOD_REF_COUNT_MODULEPATH=251,17182 -export __LMOD_REF_COUNT_MODULEPATH;252,17344 -MODULEPATH=253,17380 -export MODULEPATH;254,17517 -MPICH_HOME=255,17536 -export MPICH_HOME;256,17578 -MPIHOME=257,17597 -export MPIHOME;258,17636 -TACC_IMPI_BIN=259,17652 -export TACC_IMPI_BIN;260,17701 -TACC_IMPI_DIR=261,17723 -export TACC_IMPI_DIR;262,17768 -TACC_IMPI_INC=263,17790 -export TACC_IMPI_INC;264,17843 -TACC_IMPI_LIB=265,17865 -export TACC_IMPI_LIB;266,17914 -_LMFILES_=267,17936 -export _LMFILES_;268,18114 -_ModuleTable_=269,18132 -export _ModuleTable_;270,18997 -unset LD_LIBRARY_PATH;276,19196 -unset LMOD_FAMILY_COMPILER;277,19219 -unset LMOD_FAMILY_COMPILER_VERSION;278,19247 -unset LMOD_FAMILY_MPI;279,19283 -unset LMOD_FAMILY_MPI_VERSION;280,19306 -unset LOADEDMODULES;281,19337 -unset __LMOD_REF_COUNT_MANPATH;282,19358 -unset MANPATH;283,19390 -__LMOD_REF_COUNT_MODULEPATH=284,19405 -export __LMOD_REF_COUNT_MODULEPATH;285,19468 -MODULEPATH=286,19504 -export MODULEPATH;287,19548 -unset MPICH_HOME;288,19567 -unset MPIHOME;289,19585 -unset TACC_IMPI_BIN;290,19600 -unset TACC_IMPI_DIR;291,19621 -unset TACC_IMPI_INC;292,19642 -unset TACC_IMPI_LIB;293,19663 -unset _LMFILES_;294,19684 -_ModuleTable_=295,19701 -export _ModuleTable_;296,20068 -export MODULEPATH;302,20261 -_ModuleTable_=303,20280 -export _ModuleTable_;304,20647 -export MODULEPATH;310,20841 -_ModuleTable_=311,20860 -export _ModuleTable_;312,21026 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;318,21245 -LD_LIBRARY_PATH=319,21286 -export LD_LIBRARY_PATH;320,21319 -LMOD_FAMILY_COMPILER=321,21343 -export LMOD_FAMILY_COMPILER;322,21369 -LMOD_FAMILY_COMPILER_VERSION=323,21398 -export LMOD_FAMILY_COMPILER_VERSION;324,21432 -LMOD_FAMILY_MPI=325,21469 -export LMOD_FAMILY_MPI;326,21491 -LMOD_FAMILY_MPI_VERSION=327,21515 -export LMOD_FAMILY_MPI_VERSION;328,21547 -LOADEDMODULES=329,21579 -export LOADEDMODULES;330,21624 -__LMOD_REF_COUNT_MANPATH=331,21646 -export __LMOD_REF_COUNT_MANPATH;332,21708 -MANPATH=333,21741 -export MANPATH;334,21784 -__LMOD_REF_COUNT_MODULEPATH=335,21800 -export __LMOD_REF_COUNT_MODULEPATH;336,21962 -MODULEPATH=337,21998 -export MODULEPATH;338,22135 -MPICH_HOME=339,22154 -export MPICH_HOME;340,22196 -MPIHOME=341,22215 -export MPIHOME;342,22254 -TACC_IMPI_BIN=343,22270 -export TACC_IMPI_BIN;344,22319 -TACC_IMPI_DIR=345,22341 -export TACC_IMPI_DIR;346,22386 -TACC_IMPI_INC=347,22408 -export TACC_IMPI_INC;348,22461 -TACC_IMPI_LIB=349,22483 -export TACC_IMPI_LIB;350,22532 -_LMFILES_=351,22554 -export _LMFILES_;352,22732 -_ModuleTable_=353,22750 -export _ModuleTable_;354,23615 -unset LD_LIBRARY_PATH;360,23814 -unset LMOD_FAMILY_COMPILER;361,23837 -unset LMOD_FAMILY_COMPILER_VERSION;362,23865 -unset LMOD_FAMILY_MPI;363,23901 -unset LMOD_FAMILY_MPI_VERSION;364,23924 -unset LOADEDMODULES;365,23955 -unset __LMOD_REF_COUNT_MANPATH;366,23976 -unset MANPATH;367,24008 -__LMOD_REF_COUNT_MODULEPATH=368,24023 -export __LMOD_REF_COUNT_MODULEPATH;369,24086 -MODULEPATH=370,24122 -export MODULEPATH;371,24166 -unset MPICH_HOME;372,24185 -unset MPIHOME;373,24203 -unset TACC_IMPI_BIN;374,24218 -unset TACC_IMPI_DIR;375,24239 -unset TACC_IMPI_INC;376,24260 -unset TACC_IMPI_LIB;377,24281 -unset _LMFILES_;378,24302 -_ModuleTable_=379,24319 -export _ModuleTable_;380,24686 -export MODULEPATH;386,24879 -_ModuleTable_=387,24898 -export _ModuleTable_;388,25265 -export MODULEPATH;394,25459 -_ModuleTable_=395,25478 -export _ModuleTable_;396,25644 -export LOADEDMODULES;402,25840 -__LMOD_REF_COUNT_MODULEPATH=403,25862 -export __LMOD_REF_COUNT_MODULEPATH;404,25966 -MODULEPATH=405,26002 -export MODULEPATH;406,26084 -MY_NAME=407,26103 -export MY_NAME;408,26120 -_LMFILES_=409,26136 -export _LMFILES_;410,26286 -_ModuleTable_=411,26304 -export _ModuleTable_;412,27007 -export MODULEPATH;418,27238 -_ModuleTable_=419,27257 -export _ModuleTable_;420,27960 +export _ModuleTable_;52,3367 +export MODULEPATH;58,3603 +_ModuleTable_=59,3622 +export _ModuleTable_;60,4522 +unset COMPILER_DEPENDENT;66,4697 +unset LMOD_FAMILY_COMPILER;67,4723 +unset LMOD_FAMILY_COMPILER_VERSION;68,4751 +LOADEDMODULES=69,4787 +export LOADEDMODULES;70,4815 +__LMOD_REF_COUNT_MODULEPATH=71,4837 +export __LMOD_REF_COUNT_MODULEPATH;72,4900 +MODULEPATH=73,4936 +export MODULEPATH;74,4980 +MY_VERSION=75,4999 +export MY_VERSION;76,5017 +_LMFILES_=77,5036 +export _LMFILES_;78,5096 +_ModuleTable_=79,5114 +export _ModuleTable_;80,5681 +export MODULEPATH;86,5873 +_ModuleTable_=87,5892 +export _ModuleTable_;88,6459 +export MODULEPATH;94,6659 +_ModuleTable_=95,6678 +export _ModuleTable_;96,7043 +export COMPILER_DEPENDENT;102,7230 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=103,7257 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;104,7312 +LD_LIBRARY_PATH=105,7353 +export LD_LIBRARY_PATH;106,7386 +LMOD_FAMILY_COMPILER=107,7410 +export LMOD_FAMILY_COMPILER;108,7436 +LMOD_FAMILY_COMPILER_VERSION=109,7465 +export LMOD_FAMILY_COMPILER_VERSION;110,7499 +LMOD_FAMILY_MPI=111,7536 +export LMOD_FAMILY_MPI;112,7558 +LMOD_FAMILY_MPI_VERSION=113,7582 +export LMOD_FAMILY_MPI_VERSION;114,7614 +LOADEDMODULES=115,7646 +export LOADEDMODULES;116,7704 +__LMOD_REF_COUNT_MANPATH=117,7726 +export __LMOD_REF_COUNT_MANPATH;118,7788 +MANPATH=119,7821 +export MANPATH;120,7864 +__LMOD_REF_COUNT_MODULEPATH=121,7880 +export __LMOD_REF_COUNT_MODULEPATH;122,8042 +MODULEPATH=123,8078 +export MODULEPATH;124,8215 +MPICH_HOME=125,8234 +export MPICH_HOME;126,8276 +MPIHOME=127,8295 +export MPIHOME;128,8334 +MY_VERSION=129,8350 +export MY_VERSION;130,8368 +TACC_IMPI_BIN=131,8387 +export TACC_IMPI_BIN;132,8436 +TACC_IMPI_DIR=133,8458 +export TACC_IMPI_DIR;134,8503 +TACC_IMPI_INC=135,8525 +export TACC_IMPI_INC;136,8578 +TACC_IMPI_LIB=137,8600 +export TACC_IMPI_LIB;138,8649 +_LMFILES_=139,8671 +export _LMFILES_;140,8910 +_ModuleTable_=141,8928 +export _ModuleTable_;142,10189 +export MODULEPATH;148,10476 +_ModuleTable_=149,10495 +export _ModuleTable_;150,11756 +LD_LIBRARY_PATH=156,11943 +export LD_LIBRARY_PATH;157,11976 +LMOD_FAMILY_COMPILER=158,12000 +export LMOD_FAMILY_COMPILER;159,12028 +LMOD_FAMILY_COMPILER_VERSION=160,12057 +export LMOD_FAMILY_COMPILER_VERSION;161,12094 +LMOD_FAMILY_MPI=162,12131 +export LMOD_FAMILY_MPI;163,12153 +LMOD_FAMILY_MPI_VERSION=164,12177 +export LMOD_FAMILY_MPI_VERSION;165,12209 +LOADEDMODULES=166,12241 +export LOADEDMODULES;167,12304 +__LMOD_REF_COUNT_MANPATH=168,12326 +export __LMOD_REF_COUNT_MANPATH;169,12391 +MANPATH=170,12424 +export MANPATH;171,12470 +__LMOD_REF_COUNT_MODULEPATH=172,12486 +export __LMOD_REF_COUNT_MODULEPATH;173,12654 +MODULEPATH=174,12690 +export MODULEPATH;175,12833 +MPICH_HOME=176,12852 +export MPICH_HOME;177,12897 +MPIHOME=178,12916 +export MPIHOME;179,12958 +MY_VERSION=180,12974 +export MY_VERSION;181,12992 +TACC_IMPI_BIN=182,13011 +export TACC_IMPI_BIN;183,13063 +TACC_IMPI_DIR=184,13085 +export TACC_IMPI_DIR;185,13133 +TACC_IMPI_INC=186,13155 +export TACC_IMPI_INC;187,13211 +TACC_IMPI_LIB=188,13233 +export TACC_IMPI_LIB;189,13285 +_LMFILES_=190,13307 +export _LMFILES_;191,13545 +_ModuleTable_=192,13563 +export _ModuleTable_;193,14856 +export MODULEPATH;199,15149 +_ModuleTable_=200,15168 +export _ModuleTable_;201,16461 +unset LD_LIBRARY_PATH;207,16651 +unset LMOD_FAMILY_COMPILER;208,16674 +unset LMOD_FAMILY_COMPILER_VERSION;209,16702 +unset LMOD_FAMILY_MPI;210,16738 +unset LMOD_FAMILY_MPI_VERSION;211,16761 +unset LOADEDMODULES;212,16792 +unset __LMOD_REF_COUNT_MANPATH;213,16813 +unset MANPATH;214,16845 +__LMOD_REF_COUNT_MODULEPATH=215,16860 +export __LMOD_REF_COUNT_MODULEPATH;216,16923 +MODULEPATH=217,16959 +export MODULEPATH;218,17003 +unset MPICH_HOME;219,17022 +unset MPIHOME;220,17040 +unset MY_VERSION;221,17055 +unset TACC_IMPI_BIN;222,17073 +unset TACC_IMPI_DIR;223,17094 +unset TACC_IMPI_INC;224,17115 +unset TACC_IMPI_LIB;225,17136 +unset _LMFILES_;226,17157 +_ModuleTable_=227,17174 +export _ModuleTable_;228,17340 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;234,17559 +LD_LIBRARY_PATH=235,17600 +export LD_LIBRARY_PATH;236,17633 +LMOD_FAMILY_COMPILER=237,17657 +export LMOD_FAMILY_COMPILER;238,17683 +LMOD_FAMILY_COMPILER_VERSION=239,17712 +export LMOD_FAMILY_COMPILER_VERSION;240,17746 +LMOD_FAMILY_MPI=241,17783 +export LMOD_FAMILY_MPI;242,17805 +LMOD_FAMILY_MPI_VERSION=243,17829 +export LMOD_FAMILY_MPI_VERSION;244,17861 +LOADEDMODULES=245,17893 +export LOADEDMODULES;246,17938 +__LMOD_REF_COUNT_MANPATH=247,17960 +export __LMOD_REF_COUNT_MANPATH;248,18022 +MANPATH=249,18055 +export MANPATH;250,18098 +__LMOD_REF_COUNT_MODULEPATH=251,18114 +export __LMOD_REF_COUNT_MODULEPATH;252,18276 +MODULEPATH=253,18312 +export MODULEPATH;254,18449 +MPICH_HOME=255,18468 +export MPICH_HOME;256,18510 +MPIHOME=257,18529 +export MPIHOME;258,18568 +TACC_IMPI_BIN=259,18584 +export TACC_IMPI_BIN;260,18633 +TACC_IMPI_DIR=261,18655 +export TACC_IMPI_DIR;262,18700 +TACC_IMPI_INC=263,18722 +export TACC_IMPI_INC;264,18775 +TACC_IMPI_LIB=265,18797 +export TACC_IMPI_LIB;266,18846 +_LMFILES_=267,18868 +export _LMFILES_;268,19046 +_ModuleTable_=269,19064 +export _ModuleTable_;270,20114 +unset LD_LIBRARY_PATH;276,20313 +unset LMOD_FAMILY_COMPILER;277,20336 +unset LMOD_FAMILY_COMPILER_VERSION;278,20364 +unset LMOD_FAMILY_MPI;279,20400 +unset LMOD_FAMILY_MPI_VERSION;280,20423 +unset LOADEDMODULES;281,20454 +unset __LMOD_REF_COUNT_MANPATH;282,20475 +unset MANPATH;283,20507 +__LMOD_REF_COUNT_MODULEPATH=284,20522 +export __LMOD_REF_COUNT_MODULEPATH;285,20585 +MODULEPATH=286,20621 +export MODULEPATH;287,20665 +unset MPICH_HOME;288,20684 +unset MPIHOME;289,20702 +unset TACC_IMPI_BIN;290,20717 +unset TACC_IMPI_DIR;291,20738 +unset TACC_IMPI_INC;292,20759 +unset TACC_IMPI_LIB;293,20780 +unset _LMFILES_;294,20801 +_ModuleTable_=295,20818 +export _ModuleTable_;296,21185 +export MODULEPATH;302,21378 +_ModuleTable_=303,21397 +export _ModuleTable_;304,21764 +export MODULEPATH;310,21958 +_ModuleTable_=311,21977 +export _ModuleTable_;312,22143 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;318,22362 +LD_LIBRARY_PATH=319,22403 +export LD_LIBRARY_PATH;320,22436 +LMOD_FAMILY_COMPILER=321,22460 +export LMOD_FAMILY_COMPILER;322,22486 +LMOD_FAMILY_COMPILER_VERSION=323,22515 +export LMOD_FAMILY_COMPILER_VERSION;324,22549 +LMOD_FAMILY_MPI=325,22586 +export LMOD_FAMILY_MPI;326,22608 +LMOD_FAMILY_MPI_VERSION=327,22632 +export LMOD_FAMILY_MPI_VERSION;328,22664 +LOADEDMODULES=329,22696 +export LOADEDMODULES;330,22741 +__LMOD_REF_COUNT_MANPATH=331,22763 +export __LMOD_REF_COUNT_MANPATH;332,22825 +MANPATH=333,22858 +export MANPATH;334,22901 +__LMOD_REF_COUNT_MODULEPATH=335,22917 +export __LMOD_REF_COUNT_MODULEPATH;336,23079 +MODULEPATH=337,23115 +export MODULEPATH;338,23252 +MPICH_HOME=339,23271 +export MPICH_HOME;340,23313 +MPIHOME=341,23332 +export MPIHOME;342,23371 +TACC_IMPI_BIN=343,23387 +export TACC_IMPI_BIN;344,23436 +TACC_IMPI_DIR=345,23458 +export TACC_IMPI_DIR;346,23503 +TACC_IMPI_INC=347,23525 +export TACC_IMPI_INC;348,23578 +TACC_IMPI_LIB=349,23600 +export TACC_IMPI_LIB;350,23649 +_LMFILES_=351,23671 +export _LMFILES_;352,23849 +_ModuleTable_=353,23867 +export _ModuleTable_;354,24917 +unset LD_LIBRARY_PATH;360,25116 +unset LMOD_FAMILY_COMPILER;361,25139 +unset LMOD_FAMILY_COMPILER_VERSION;362,25167 +unset LMOD_FAMILY_MPI;363,25203 +unset LMOD_FAMILY_MPI_VERSION;364,25226 +unset LOADEDMODULES;365,25257 +unset __LMOD_REF_COUNT_MANPATH;366,25278 +unset MANPATH;367,25310 +__LMOD_REF_COUNT_MODULEPATH=368,25325 +export __LMOD_REF_COUNT_MODULEPATH;369,25388 +MODULEPATH=370,25424 +export MODULEPATH;371,25468 +unset MPICH_HOME;372,25487 +unset MPIHOME;373,25505 +unset TACC_IMPI_BIN;374,25520 +unset TACC_IMPI_DIR;375,25541 +unset TACC_IMPI_INC;376,25562 +unset TACC_IMPI_LIB;377,25583 +unset _LMFILES_;378,25604 +_ModuleTable_=379,25621 +export _ModuleTable_;380,25988 +export MODULEPATH;386,26181 +_ModuleTable_=387,26200 +export _ModuleTable_;388,26567 +export MODULEPATH;394,26761 +_ModuleTable_=395,26780 +export _ModuleTable_;396,26946 +export LOADEDMODULES;402,27142 +__LMOD_REF_COUNT_MODULEPATH=403,27164 +export __LMOD_REF_COUNT_MODULEPATH;404,27268 +MODULEPATH=405,27304 +export MODULEPATH;406,27386 +MY_NAME=407,27405 +export MY_NAME;408,27422 +_LMFILES_=409,27438 +export _LMFILES_;410,27588 +_ModuleTable_=411,27606 +export _ModuleTable_;412,28392 +export MODULEPATH;418,28623 +_ModuleTable_=419,28642 +export _ModuleTable_;420,29428 rt/hierarchy/hierarchy.tdesc,21 local testName 2,15 @@ -11977,29 +12101,29 @@ export MODULEPATH;28,1165 _LMFILES_=29,1184 export _LMFILES_;30,1298 _ModuleTable_=31,1316 -export _ModuleTable_;32,1914 -export MODULEPATH;38,2151 -_ModuleTable_=39,2170 -export _ModuleTable_;40,2768 -export MODULEPATH;46,3019 -_ModuleTable_=47,3038 -export _ModuleTable_;48,3636 -export LMOD_FAMILY_COMPILER;54,3825 -LMOD_FAMILY_COMPILER_VERSION=55,3854 -export LMOD_FAMILY_COMPILER_VERSION;56,3889 -LOADEDMODULES=57,3926 -export LOADEDMODULES;58,3963 -__LMOD_REF_COUNT_MODULEPATH=59,3985 -export __LMOD_REF_COUNT_MODULEPATH;60,4098 -MODULEPATH=61,4134 -export MODULEPATH;62,4225 -_LMFILES_=63,4244 -export _LMFILES_;64,4364 -_ModuleTable_=65,4382 -export _ModuleTable_;66,4998 -export MODULEPATH;72,5238 -_ModuleTable_=73,5257 -export _ModuleTable_;74,5873 +export _ModuleTable_;32,2003 +export MODULEPATH;38,2240 +_ModuleTable_=39,2259 +export _ModuleTable_;40,2946 +export MODULEPATH;46,3197 +_ModuleTable_=47,3216 +export _ModuleTable_;48,3903 +export LMOD_FAMILY_COMPILER;54,4092 +LMOD_FAMILY_COMPILER_VERSION=55,4121 +export LMOD_FAMILY_COMPILER_VERSION;56,4156 +LOADEDMODULES=57,4193 +export LOADEDMODULES;58,4230 +__LMOD_REF_COUNT_MODULEPATH=59,4252 +export __LMOD_REF_COUNT_MODULEPATH;60,4365 +MODULEPATH=61,4401 +export MODULEPATH;62,4492 +_LMFILES_=63,4511 +export _LMFILES_;64,4631 +_ModuleTable_=65,4649 +export _ModuleTable_;66,5357 +export MODULEPATH;72,5597 +_ModuleTable_=73,5616 +export _ModuleTable_;74,6324 rt/use_unuse/out.txt,1398 export A;10,266 @@ -12056,7 +12180,7 @@ export _ModuleTable_;104,5189 rt/use_unuse/use_unuse.tdesc,19 testdescript 2,15 -rt/hidden/out.txt,388 +rt/hidden/out.txt,1186 export __LMOD_REF_COUNT_MODULEPATH;10,327 MODULEPATH=11,363 export MODULEPATH;12,399 @@ -12072,6 +12196,37 @@ export _ModuleTable_;26,1215 export MODULEPATH;32,1399 _ModuleTable_=33,1418 export _ModuleTable_;34,1744 +export MODULEPATH;40,1929 +_ModuleTable_=41,1948 +export _ModuleTable_;42,2274 +__LMOD_REF_COUNT_MODULEPATH=48,2455 +export __LMOD_REF_COUNT_MODULEPATH;49,2550 +MODULEPATH=50,2586 +export MODULEPATH;51,2659 +unset _LMFILES_;52,2678 +_ModuleTable_=53,2695 +export _ModuleTable_;54,2921 +export B;60,3080 +LOADEDMODULES=61,3090 +export LOADEDMODULES;62,3113 +MODULEPATH=63,3135 +export MODULEPATH;64,3208 +_LMFILES_=65,3227 +export _LMFILES_;66,3282 +_ModuleTable_=67,3300 +export _ModuleTable_;68,3705 +export A;74,3862 +LOADEDMODULES=75,3872 +export LOADEDMODULES;76,3901 +MODULEPATH=77,3923 +export MODULEPATH;78,3996 +_LMFILES_=79,4015 +export _LMFILES_;80,4109 +_ModuleTable_=81,4127 +export _ModuleTable_;82,4684 +export MODULEPATH;88,4905 +_ModuleTable_=89,4924 +export _ModuleTable_;90,5481 rt/hidden/hidden.tdesc,21 local testName 2,15 @@ -12174,205 +12329,205 @@ export TBBROOT;100,6875 _LMFILES_=101,6891 export _LMFILES_;102,7210 _ModuleTable_=103,7228 -export _ModuleTable_;104,8756 -export MODULEPATH;110,9035 -_ModuleTable_=111,9054 -export _ModuleTable_;112,10582 -export __LMOD_REF_COUNT_INFOPATH;118,10808 -INFOPATH=119,10842 -export INFOPATH;120,10887 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=121,10904 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;122,11500 -LD_LIBRARY_PATH=123,11541 -export LD_LIBRARY_PATH;124,12091 -LMOD_FAMILY_MPI=125,12115 -export LMOD_FAMILY_MPI;126,12137 -LMOD_FAMILY_MPI_VERSION=127,12161 -export LMOD_FAMILY_MPI_VERSION;128,12190 -LOADEDMODULES=129,12222 -export LOADEDMODULES;130,12307 -__LMOD_REF_COUNT_MANPATH=131,12329 -export __LMOD_REF_COUNT_MANPATH;132,12592 -MANPATH=133,12625 -export MANPATH;134,12848 -__LMOD_REF_COUNT_MODULEPATH=135,12864 -export __LMOD_REF_COUNT_MODULEPATH;136,13016 -MODULEPATH=137,13052 -export MODULEPATH;138,13179 -MPICH_HOME=139,13198 -export MPICH_HOME;140,13241 -__LMOD_REF_COUNT_PATH=141,13260 -export __LMOD_REF_COUNT_PATH;142,13704 -PATH=143,13734 -export PATH;144,14132 -__LMOD_REF_COUNT_PKG_CONFIG_PATH=145,14145 -export __LMOD_REF_COUNT_PKG_CONFIG_PATH;146,14226 -PKG_CONFIG_PATH=147,14267 -export PKG_CONFIG_PATH;148,14329 -TACC_MPI_GETMODE=149,14353 -export TACC_MPI_GETMODE;150,14380 -_LMFILES_=151,14405 -export _LMFILES_;152,14718 -_ModuleTable_=153,14736 -export _ModuleTable_;154,16223 -export MODULEPATH;160,16498 -_ModuleTable_=161,16517 -export _ModuleTable_;162,18004 -export MODULEPATH;168,18279 -_ModuleTable_=169,18298 -export _ModuleTable_;170,19785 -unset ICC_BIN;176,19946 -unset ICC_LIB;177,19961 -unset IFC_BIN;178,19976 -unset IFC_LIB;179,19991 -unset IIDB_BIN;180,20006 -unset __LMOD_REF_COUNT_INCLUDE;181,20022 -unset INCLUDE;182,20054 -unset __LMOD_REF_COUNT_INFOPATH;183,20069 -unset INFOPATH;184,20102 -unset __LMOD_REF_COUNT_IPPROOT;185,20118 -unset IPPROOT;186,20150 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;187,20165 -unset LD_LIBRARY_PATH;188,20205 -unset LMOD_FAMILY_COMPILER;189,20228 -unset LMOD_FAMILY_COMPILER_VERSION;190,20256 -unset LMOD_FAMILY_MPI;191,20292 -unset LMOD_FAMILY_MPI_VERSION;192,20315 -unset LOADEDMODULES;193,20346 -unset __LMOD_REF_COUNT_MANPATH;194,20367 -unset MANPATH;195,20399 -unset MIC_ENV_PREFIX;196,20414 -unset __LMOD_REF_COUNT_MIC_LD_LIBRARY_PATH;197,20436 -unset MIC_LD_LIBRARY_PATH;198,20480 -unset __LMOD_REF_COUNT_MKLROOT;199,20507 -unset MKLROOT;200,20539 -__LMOD_REF_COUNT_MODULEPATH=201,20554 -export __LMOD_REF_COUNT_MODULEPATH;202,20612 -MODULEPATH=203,20648 -export MODULEPATH;204,20687 -unset MPICH_HOME;205,20706 -unset OMP_NUM_THREADS;206,20724 -__LMOD_REF_COUNT_PATH=207,20747 -export __LMOD_REF_COUNT_PATH;208,20807 -PATH=209,20837 -export PATH;210,20875 -unset __LMOD_REF_COUNT_PKG_CONFIG_PATH;211,20888 -unset PKG_CONFIG_PATH;212,20928 -unset __LMOD_REF_COUNT_SINK_LD_LIBRARY_PATH;213,20951 -unset SINK_LD_LIBRARY_PATH;214,20996 -unset STTY_ARGS;215,21024 -unset SYSTEM;216,21041 -unset TACC_DOMAIN;217,21055 -unset TACC_MKL_DIR;218,21074 -unset TACC_MKL_INC;219,21094 -unset TACC_MKL_LIB;220,21114 -unset TACC_MPI_GETMODE;221,21134 -unset TACC_SYSTEM;222,21158 -unset __LMOD_REF_COUNT_TBBROOT;223,21177 -unset TBBROOT;224,21209 -unset _LMFILES_;225,21224 -_ModuleTable_=226,21241 -export _ModuleTable_;227,21397 -export APPS;233,21568 -ICC_BIN=234,21581 -export ICC_BIN;235,21648 -ICC_LIB=236,21664 -export ICC_LIB;237,21740 -IFC_BIN=238,21756 -export IFC_BIN;239,21823 -IFC_LIB=240,21839 -export IFC_LIB;241,21915 -IIDB_BIN=242,21931 -export IIDB_BIN;243,21999 -__LMOD_REF_COUNT_INCLUDE=244,22016 -export __LMOD_REF_COUNT_INCLUDE;245,22163 -INCLUDE=246,22196 -export INCLUDE;247,22321 -__LMOD_REF_COUNT_INFOPATH=248,22337 -export __LMOD_REF_COUNT_INFOPATH;249,22401 -INFOPATH=250,22435 -export INFOPATH;251,22480 -__LMOD_REF_COUNT_IPPROOT=252,22497 -export __LMOD_REF_COUNT_IPPROOT;253,22575 -IPPROOT=254,22608 -export IPPROOT;255,22667 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=256,22683 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;257,23279 -LD_LIBRARY_PATH=258,23320 -export LD_LIBRARY_PATH;259,23870 -LMOD_FAMILY_COMPILER=260,23894 -export LMOD_FAMILY_COMPILER;261,23922 -LMOD_FAMILY_COMPILER_VERSION=262,23951 -export LMOD_FAMILY_COMPILER_VERSION;263,23992 -LMOD_FAMILY_MPI=264,24029 -export LMOD_FAMILY_MPI;265,24051 -LMOD_FAMILY_MPI_VERSION=266,24075 -export LMOD_FAMILY_MPI_VERSION;267,24104 -LOADEDMODULES=268,24136 -export LOADEDMODULES;269,24221 -__LMOD_REF_COUNT_MANPATH=270,24243 -export __LMOD_REF_COUNT_MANPATH;271,24506 -MANPATH=272,24539 -export MANPATH;273,24762 -MIC_ENV_PREFIX=274,24778 -export MIC_ENV_PREFIX;275,24798 -__LMOD_REF_COUNT_MIC_LD_LIBRARY_PATH=276,24821 -export __LMOD_REF_COUNT_MIC_LD_LIBRARY_PATH;277,25058 -MIC_LD_LIBRARY_PATH=278,25103 -export MIC_LD_LIBRARY_PATH;279,25312 -__LMOD_REF_COUNT_MKLROOT=280,25340 -export __LMOD_REF_COUNT_MKLROOT;281,25418 -MKLROOT=282,25451 -export MKLROOT;283,25510 -__LMOD_REF_COUNT_MODULEPATH=284,25526 -export __LMOD_REF_COUNT_MODULEPATH;285,25678 -MODULEPATH=286,25714 -export MODULEPATH;287,25841 -MPICH_HOME=288,25860 -export MPICH_HOME;289,25903 -OMP_NUM_THREADS=290,25922 -export OMP_NUM_THREADS;291,25941 -__LMOD_REF_COUNT_PATH=292,25965 -export __LMOD_REF_COUNT_PATH;293,26409 -PATH=294,26439 -export PATH;295,26837 -__LMOD_REF_COUNT_PKG_CONFIG_PATH=296,26850 -export __LMOD_REF_COUNT_PKG_CONFIG_PATH;297,26931 -PKG_CONFIG_PATH=298,26972 -export PKG_CONFIG_PATH;299,27034 -__LMOD_REF_COUNT_SINK_LD_LIBRARY_PATH=300,27058 -export __LMOD_REF_COUNT_SINK_LD_LIBRARY_PATH;301,27223 -SINK_LD_LIBRARY_PATH=302,27269 -export SINK_LD_LIBRARY_PATH;303,27412 -STTY_ARGS=304,27441 -export STTY_ARGS;305,27457 -SYSTEM=306,27475 -export SYSTEM;307,27489 -TACC_DOMAIN=308,27504 -export TACC_DOMAIN;309,27526 -TACC_MKL_DIR=310,27546 -export TACC_MKL_DIR;311,27610 -TACC_MKL_INC=312,27631 -export TACC_MKL_INC;313,27703 -TACC_MKL_LIB=314,27724 -export TACC_MKL_LIB;315,27800 -TACC_MPI_GETMODE=316,27821 -export TACC_MPI_GETMODE;317,27848 -TACC_SYSTEM=318,27873 -export TACC_SYSTEM;319,27895 -__LMOD_REF_COUNT_TBBROOT=320,27915 -export __LMOD_REF_COUNT_TBBROOT;321,27993 -TBBROOT=322,28026 -export TBBROOT;323,28085 -_LMFILES_=324,28101 -export _LMFILES_;325,28414 -_ModuleTable_=326,28432 -export _ModuleTable_;327,29919 -__LMOD_DEFAULT_MODULES_LOADED__=328,29941 -export __LMOD_DEFAULT_MODULES_LOADED__;329,29976 -export MODULEPATH;335,30269 -_ModuleTable_=336,30288 -export _ModuleTable_;337,31775 +export _ModuleTable_;104,8940 +export MODULEPATH;110,9219 +_ModuleTable_=111,9238 +export _ModuleTable_;112,10950 +export __LMOD_REF_COUNT_INFOPATH;118,11176 +INFOPATH=119,11210 +export INFOPATH;120,11255 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=121,11272 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;122,11868 +LD_LIBRARY_PATH=123,11909 +export LD_LIBRARY_PATH;124,12459 +LMOD_FAMILY_MPI=125,12483 +export LMOD_FAMILY_MPI;126,12505 +LMOD_FAMILY_MPI_VERSION=127,12529 +export LMOD_FAMILY_MPI_VERSION;128,12558 +LOADEDMODULES=129,12590 +export LOADEDMODULES;130,12675 +__LMOD_REF_COUNT_MANPATH=131,12697 +export __LMOD_REF_COUNT_MANPATH;132,12960 +MANPATH=133,12993 +export MANPATH;134,13216 +__LMOD_REF_COUNT_MODULEPATH=135,13232 +export __LMOD_REF_COUNT_MODULEPATH;136,13384 +MODULEPATH=137,13420 +export MODULEPATH;138,13547 +MPICH_HOME=139,13566 +export MPICH_HOME;140,13609 +__LMOD_REF_COUNT_PATH=141,13628 +export __LMOD_REF_COUNT_PATH;142,14072 +PATH=143,14102 +export PATH;144,14500 +__LMOD_REF_COUNT_PKG_CONFIG_PATH=145,14513 +export __LMOD_REF_COUNT_PKG_CONFIG_PATH;146,14594 +PKG_CONFIG_PATH=147,14635 +export PKG_CONFIG_PATH;148,14697 +TACC_MPI_GETMODE=149,14721 +export TACC_MPI_GETMODE;150,14748 +_LMFILES_=151,14773 +export _LMFILES_;152,15086 +_ModuleTable_=153,15104 +export _ModuleTable_;154,16771 +export MODULEPATH;160,17046 +_ModuleTable_=161,17065 +export _ModuleTable_;162,18732 +export MODULEPATH;168,19007 +_ModuleTable_=169,19026 +export _ModuleTable_;170,20693 +unset ICC_BIN;176,20854 +unset ICC_LIB;177,20869 +unset IFC_BIN;178,20884 +unset IFC_LIB;179,20899 +unset IIDB_BIN;180,20914 +unset __LMOD_REF_COUNT_INCLUDE;181,20930 +unset INCLUDE;182,20962 +unset __LMOD_REF_COUNT_INFOPATH;183,20977 +unset INFOPATH;184,21010 +unset __LMOD_REF_COUNT_IPPROOT;185,21026 +unset IPPROOT;186,21058 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;187,21073 +unset LD_LIBRARY_PATH;188,21113 +unset LMOD_FAMILY_COMPILER;189,21136 +unset LMOD_FAMILY_COMPILER_VERSION;190,21164 +unset LMOD_FAMILY_MPI;191,21200 +unset LMOD_FAMILY_MPI_VERSION;192,21223 +unset LOADEDMODULES;193,21254 +unset __LMOD_REF_COUNT_MANPATH;194,21275 +unset MANPATH;195,21307 +unset MIC_ENV_PREFIX;196,21322 +unset __LMOD_REF_COUNT_MIC_LD_LIBRARY_PATH;197,21344 +unset MIC_LD_LIBRARY_PATH;198,21388 +unset __LMOD_REF_COUNT_MKLROOT;199,21415 +unset MKLROOT;200,21447 +__LMOD_REF_COUNT_MODULEPATH=201,21462 +export __LMOD_REF_COUNT_MODULEPATH;202,21520 +MODULEPATH=203,21556 +export MODULEPATH;204,21595 +unset MPICH_HOME;205,21614 +unset OMP_NUM_THREADS;206,21632 +__LMOD_REF_COUNT_PATH=207,21655 +export __LMOD_REF_COUNT_PATH;208,21715 +PATH=209,21745 +export PATH;210,21783 +unset __LMOD_REF_COUNT_PKG_CONFIG_PATH;211,21796 +unset PKG_CONFIG_PATH;212,21836 +unset __LMOD_REF_COUNT_SINK_LD_LIBRARY_PATH;213,21859 +unset SINK_LD_LIBRARY_PATH;214,21904 +unset STTY_ARGS;215,21932 +unset SYSTEM;216,21949 +unset TACC_DOMAIN;217,21963 +unset TACC_MKL_DIR;218,21982 +unset TACC_MKL_INC;219,22002 +unset TACC_MKL_LIB;220,22022 +unset TACC_MPI_GETMODE;221,22042 +unset TACC_SYSTEM;222,22066 +unset __LMOD_REF_COUNT_TBBROOT;223,22085 +unset TBBROOT;224,22117 +unset _LMFILES_;225,22132 +_ModuleTable_=226,22149 +export _ModuleTable_;227,22305 +export APPS;233,22476 +ICC_BIN=234,22489 +export ICC_BIN;235,22556 +ICC_LIB=236,22572 +export ICC_LIB;237,22648 +IFC_BIN=238,22664 +export IFC_BIN;239,22731 +IFC_LIB=240,22747 +export IFC_LIB;241,22823 +IIDB_BIN=242,22839 +export IIDB_BIN;243,22907 +__LMOD_REF_COUNT_INCLUDE=244,22924 +export __LMOD_REF_COUNT_INCLUDE;245,23071 +INCLUDE=246,23104 +export INCLUDE;247,23229 +__LMOD_REF_COUNT_INFOPATH=248,23245 +export __LMOD_REF_COUNT_INFOPATH;249,23309 +INFOPATH=250,23343 +export INFOPATH;251,23388 +__LMOD_REF_COUNT_IPPROOT=252,23405 +export __LMOD_REF_COUNT_IPPROOT;253,23483 +IPPROOT=254,23516 +export IPPROOT;255,23575 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=256,23591 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;257,24187 +LD_LIBRARY_PATH=258,24228 +export LD_LIBRARY_PATH;259,24778 +LMOD_FAMILY_COMPILER=260,24802 +export LMOD_FAMILY_COMPILER;261,24830 +LMOD_FAMILY_COMPILER_VERSION=262,24859 +export LMOD_FAMILY_COMPILER_VERSION;263,24900 +LMOD_FAMILY_MPI=264,24937 +export LMOD_FAMILY_MPI;265,24959 +LMOD_FAMILY_MPI_VERSION=266,24983 +export LMOD_FAMILY_MPI_VERSION;267,25012 +LOADEDMODULES=268,25044 +export LOADEDMODULES;269,25129 +__LMOD_REF_COUNT_MANPATH=270,25151 +export __LMOD_REF_COUNT_MANPATH;271,25414 +MANPATH=272,25447 +export MANPATH;273,25670 +MIC_ENV_PREFIX=274,25686 +export MIC_ENV_PREFIX;275,25706 +__LMOD_REF_COUNT_MIC_LD_LIBRARY_PATH=276,25729 +export __LMOD_REF_COUNT_MIC_LD_LIBRARY_PATH;277,25966 +MIC_LD_LIBRARY_PATH=278,26011 +export MIC_LD_LIBRARY_PATH;279,26220 +__LMOD_REF_COUNT_MKLROOT=280,26248 +export __LMOD_REF_COUNT_MKLROOT;281,26326 +MKLROOT=282,26359 +export MKLROOT;283,26418 +__LMOD_REF_COUNT_MODULEPATH=284,26434 +export __LMOD_REF_COUNT_MODULEPATH;285,26586 +MODULEPATH=286,26622 +export MODULEPATH;287,26749 +MPICH_HOME=288,26768 +export MPICH_HOME;289,26811 +OMP_NUM_THREADS=290,26830 +export OMP_NUM_THREADS;291,26849 +__LMOD_REF_COUNT_PATH=292,26873 +export __LMOD_REF_COUNT_PATH;293,27317 +PATH=294,27347 +export PATH;295,27745 +__LMOD_REF_COUNT_PKG_CONFIG_PATH=296,27758 +export __LMOD_REF_COUNT_PKG_CONFIG_PATH;297,27839 +PKG_CONFIG_PATH=298,27880 +export PKG_CONFIG_PATH;299,27942 +__LMOD_REF_COUNT_SINK_LD_LIBRARY_PATH=300,27966 +export __LMOD_REF_COUNT_SINK_LD_LIBRARY_PATH;301,28131 +SINK_LD_LIBRARY_PATH=302,28177 +export SINK_LD_LIBRARY_PATH;303,28320 +STTY_ARGS=304,28349 +export STTY_ARGS;305,28365 +SYSTEM=306,28383 +export SYSTEM;307,28397 +TACC_DOMAIN=308,28412 +export TACC_DOMAIN;309,28434 +TACC_MKL_DIR=310,28454 +export TACC_MKL_DIR;311,28518 +TACC_MKL_INC=312,28539 +export TACC_MKL_INC;313,28611 +TACC_MKL_LIB=314,28632 +export TACC_MKL_LIB;315,28708 +TACC_MPI_GETMODE=316,28729 +export TACC_MPI_GETMODE;317,28756 +TACC_SYSTEM=318,28781 +export TACC_SYSTEM;319,28803 +__LMOD_REF_COUNT_TBBROOT=320,28823 +export __LMOD_REF_COUNT_TBBROOT;321,28901 +TBBROOT=322,28934 +export TBBROOT;323,28993 +_LMFILES_=324,29009 +export _LMFILES_;325,29322 +_ModuleTable_=326,29340 +export _ModuleTable_;327,31007 +__LMOD_DEFAULT_MODULES_LOADED__=328,31029 +export __LMOD_DEFAULT_MODULES_LOADED__;329,31064 +export MODULEPATH;335,31357 +_ModuleTable_=336,31376 +export _ModuleTable_;337,33043 rt/mgrload_func/out.txt,989 export A;10,269 @@ -12472,21 +12627,21 @@ export MY_VERSION;28,1224 _LMFILES_=29,1243 export _LMFILES_;30,1342 _ModuleTable_=31,1360 -export _ModuleTable_;32,1894 -export LOADEDMODULES;38,2102 -__LMOD_REF_COUNT_MODULEPATH=39,2124 -export __LMOD_REF_COUNT_MODULEPATH;40,2259 -MODULEPATH=41,2295 -export MODULEPATH;42,2405 -MY_VERSION=43,2424 -export MY_VERSION;44,2440 -_LMFILES_=45,2459 -export _LMFILES_;46,2558 -_ModuleTable_=47,2576 -export _ModuleTable_;48,3144 -export MODULEPATH;54,3402 -_ModuleTable_=55,3421 -export _ModuleTable_;56,3989 +export _ModuleTable_;32,1972 +export LOADEDMODULES;38,2180 +__LMOD_REF_COUNT_MODULEPATH=39,2202 +export __LMOD_REF_COUNT_MODULEPATH;40,2337 +MODULEPATH=41,2373 +export MODULEPATH;42,2483 +MY_VERSION=43,2502 +export MY_VERSION;44,2518 +_LMFILES_=45,2537 +export _LMFILES_;46,2636 +_ModuleTable_=47,2654 +export _ModuleTable_;48,3300 +export MODULEPATH;54,3558 +_ModuleTable_=55,3577 +export _ModuleTable_;56,4223 rt/oldStdEnv/out.txt,893 export LOADEDMODULES;10,291 @@ -12667,22 +12822,22 @@ export VSC_OS_LOCAL;24,814 _LMFILES_=25,835 export _LMFILES_;26,894 _ModuleTable_=27,912 -export _ModuleTable_;28,1310 -export LOADEDMODULES;34,1515 -MODULEPATH=35,1537 -export MODULEPATH;36,1619 -VSC_tools_version=37,1638 -export VSC_tools_version;38,1662 -_LMFILES_=39,1688 -export _LMFILES_;40,1793 -_ModuleTable_=41,1811 -export _ModuleTable_;42,2407 -export MODULEPATH;48,2637 -_ModuleTable_=49,2656 -export _ModuleTable_;50,3252 -export MODULEPATH;60,3614 -_ModuleTable_=61,3633 -export _ModuleTable_;62,4229 +export _ModuleTable_;28,1395 +export LOADEDMODULES;34,1600 +MODULEPATH=35,1622 +export MODULEPATH;36,1704 +VSC_tools_version=37,1723 +export VSC_tools_version;38,1747 +_LMFILES_=39,1773 +export _LMFILES_;40,1878 +_ModuleTable_=41,1896 +export _ModuleTable_;42,2577 +export MODULEPATH;48,2807 +_ModuleTable_=49,2826 +export _ModuleTable_;50,3507 +export MODULEPATH;60,3869 +_ModuleTable_=61,3888 +export _ModuleTable_;62,4569 rt/delcatty/delcatty.tdesc,21 local testName 2,15 @@ -12757,7 +12912,7 @@ setenv GLOBUS_TCP_PORT_RANGE 38,2158 rt/sd_tacc/mf/TACC/globus/4.0.1,41 setenv GLOBUS_TCP_PORT_RANGE 38,2104 -rt/sd_tacc/out.txt,5316 +rt/sd_tacc/out.txt,5318 export APPS;10,287 GLOBUS_HOSTNAME=11,300 export GLOBUS_HOSTNAME;12,340 @@ -12822,123 +12977,123 @@ export SHLIB_PATH;70,4525 _LMFILES_=71,4544 export _LMFILES_;72,4767 _ModuleTable_=73,4785 -export _ModuleTable_;74,5985 -export MODULEPATH;80,6273 -_ModuleTable_=81,6292 -export _ModuleTable_;82,7492 -unset GLOBUS_HOSTNAME;88,7653 -unset GLOBUS_LOCATION;89,7676 -unset GLOBUS_PATH;90,7699 -unset GLOBUS_TCP_PORT_RANGE;91,7718 -unset GPT_LOCATION;92,7747 -unset __LMOD_REF_COUNT_INFOPATH;93,7767 -unset INFOPATH;94,7800 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;95,7816 -unset LD_LIBRARY_PATH;96,7856 -unset __LMOD_REF_COUNT_LIBPATH;97,7879 -unset LIBPATH;98,7911 -unset LMOD_FAMILY_COMPILER;99,7926 -unset LMOD_FAMILY_COMPILER_VERSION;100,7954 -unset LMOD_FAMILY_MPI;101,7990 -unset LMOD_FAMILY_MPI_VERSION;102,8013 -unset LOADEDMODULES;103,8044 -unset __LMOD_REF_COUNT_MANPATH;104,8065 -unset MANPATH;105,8097 -__LMOD_REF_COUNT_MODULEPATH=106,8112 -export __LMOD_REF_COUNT_MODULEPATH;107,8173 -MODULEPATH=108,8209 -export MODULEPATH;109,8251 -unset MPICH_HOME;110,8270 -unset MYPROXY_SERVER;111,8288 -__LMOD_REF_COUNT_PATH=112,8310 -export __LMOD_REF_COUNT_PATH;113,8370 -PATH=114,8400 -export PATH;115,8438 -unset PGI;116,8451 -unset PURGE;117,8462 -unset RSHCOMMAND;118,8475 -unset SASL_PATH;119,8493 -unset __LMOD_REF_COUNT_SHLIB_PATH;120,8510 -unset SHLIB_PATH;121,8545 -unset _LMFILES_;122,8563 -_ModuleTable_=123,8580 -export _ModuleTable_;124,8742 -export APPS;130,8915 -GLOBUS_HOSTNAME=131,8928 -export GLOBUS_HOSTNAME;132,8968 -GLOBUS_LOCATION=133,8992 -export GLOBUS_LOCATION;134,9046 -GLOBUS_PATH=135,9070 -export GLOBUS_PATH;136,9120 -GLOBUS_TCP_PORT_RANGE=137,9140 -export GLOBUS_TCP_PORT_RANGE;138,9175 -GPT_LOCATION=139,9205 -export GPT_LOCATION;140,9256 -__LMOD_REF_COUNT_INFOPATH=141,9277 -export __LMOD_REF_COUNT_INFOPATH;142,9348 -INFOPATH=143,9382 -export INFOPATH;144,9434 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=145,9451 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;146,9748 -LD_LIBRARY_PATH=147,9789 -export LD_LIBRARY_PATH;148,10052 -__LMOD_REF_COUNT_LIBPATH=149,10076 -export __LMOD_REF_COUNT_LIBPATH;150,10201 -LIBPATH=151,10234 -export LIBPATH;152,10337 -LMOD_FAMILY_COMPILER=153,10353 -export LMOD_FAMILY_COMPILER;154,10379 -LMOD_FAMILY_COMPILER_VERSION=155,10408 -export LMOD_FAMILY_COMPILER_VERSION;156,10442 -LMOD_FAMILY_MPI=157,10479 -export LMOD_FAMILY_MPI;158,10505 -LMOD_FAMILY_MPI_VERSION=159,10529 -export LMOD_FAMILY_MPI_VERSION;160,10563 -LOADEDMODULES=161,10595 -export LOADEDMODULES;162,10693 -__LMOD_REF_COUNT_MANPATH=163,10715 -export __LMOD_REF_COUNT_MANPATH;164,11086 -MANPATH=165,11119 -export MANPATH;166,11438 -__LMOD_REF_COUNT_MODULEPATH=167,11454 -export __LMOD_REF_COUNT_MODULEPATH;168,11619 -MODULEPATH=169,11655 -export MODULEPATH;170,11795 -MPICH_HOME=171,11814 -export MPICH_HOME;172,11864 -MYPROXY_SERVER=173,11883 -export MYPROXY_SERVER;174,11920 -NAME=175,11943 -export NAME;176,11963 -__LMOD_REF_COUNT_PATH=177,11976 -export __LMOD_REF_COUNT_PATH;178,12359 -PATH=179,12389 -export PATH;180,12723 -PGI=181,12736 -export PGI;182,12763 -PURGE=183,12775 -export PURGE;184,12786 -RSHCOMMAND=185,12800 -export RSHCOMMAND;186,12857 -SASL_PATH=187,12876 -export SASL_PATH;188,12929 -__LMOD_REF_COUNT_SHLIB_PATH=189,12947 -export __LMOD_REF_COUNT_SHLIB_PATH;190,13075 -SHLIB_PATH=191,13111 -export SHLIB_PATH;192,13217 -STTY_ARGS=193,13236 -export STTY_ARGS;194,13252 -SYSTEM=195,13270 -export SYSTEM;196,13284 -USER_SHELL=197,13299 -export USER_SHELL;198,13316 -_LMFILES_=199,13335 -export _LMFILES_;200,13673 -_ModuleTable_=201,13691 -export _ModuleTable_;202,15354 -export MODULEPATH;208,15642 -_ModuleTable_=209,15661 -export _ModuleTable_;210,17324 +export _ModuleTable_;74,6175 +export MODULEPATH;80,6463 +_ModuleTable_=81,6482 +export _ModuleTable_;82,7872 +unset GLOBUS_HOSTNAME;88,8033 +unset GLOBUS_LOCATION;89,8056 +unset GLOBUS_PATH;90,8079 +unset GLOBUS_TCP_PORT_RANGE;91,8098 +unset GPT_LOCATION;92,8127 +unset __LMOD_REF_COUNT_INFOPATH;93,8147 +unset INFOPATH;94,8180 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;95,8196 +unset LD_LIBRARY_PATH;96,8236 +unset __LMOD_REF_COUNT_LIBPATH;97,8259 +unset LIBPATH;98,8291 +unset LMOD_FAMILY_COMPILER;99,8306 +unset LMOD_FAMILY_COMPILER_VERSION;100,8334 +unset LMOD_FAMILY_MPI;101,8370 +unset LMOD_FAMILY_MPI_VERSION;102,8393 +unset LOADEDMODULES;103,8424 +unset __LMOD_REF_COUNT_MANPATH;104,8445 +unset MANPATH;105,8477 +__LMOD_REF_COUNT_MODULEPATH=106,8492 +export __LMOD_REF_COUNT_MODULEPATH;107,8553 +MODULEPATH=108,8589 +export MODULEPATH;109,8631 +unset MPICH_HOME;110,8650 +unset MYPROXY_SERVER;111,8668 +__LMOD_REF_COUNT_PATH=112,8690 +export __LMOD_REF_COUNT_PATH;113,8750 +PATH=114,8780 +export PATH;115,8818 +unset PGI;116,8831 +unset PURGE;117,8842 +unset RSHCOMMAND;118,8855 +unset SASL_PATH;119,8873 +unset __LMOD_REF_COUNT_SHLIB_PATH;120,8890 +unset SHLIB_PATH;121,8925 +unset _LMFILES_;122,8943 +_ModuleTable_=123,8960 +export _ModuleTable_;124,9122 +export APPS;130,9295 +GLOBUS_HOSTNAME=131,9308 +export GLOBUS_HOSTNAME;132,9348 +GLOBUS_LOCATION=133,9372 +export GLOBUS_LOCATION;134,9426 +GLOBUS_PATH=135,9450 +export GLOBUS_PATH;136,9500 +GLOBUS_TCP_PORT_RANGE=137,9520 +export GLOBUS_TCP_PORT_RANGE;138,9555 +GPT_LOCATION=139,9585 +export GPT_LOCATION;140,9636 +__LMOD_REF_COUNT_INFOPATH=141,9657 +export __LMOD_REF_COUNT_INFOPATH;142,9728 +INFOPATH=143,9762 +export INFOPATH;144,9814 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=145,9831 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;146,10128 +LD_LIBRARY_PATH=147,10169 +export LD_LIBRARY_PATH;148,10432 +__LMOD_REF_COUNT_LIBPATH=149,10456 +export __LMOD_REF_COUNT_LIBPATH;150,10581 +LIBPATH=151,10614 +export LIBPATH;152,10717 +LMOD_FAMILY_COMPILER=153,10733 +export LMOD_FAMILY_COMPILER;154,10759 +LMOD_FAMILY_COMPILER_VERSION=155,10788 +export LMOD_FAMILY_COMPILER_VERSION;156,10822 +LMOD_FAMILY_MPI=157,10859 +export LMOD_FAMILY_MPI;158,10885 +LMOD_FAMILY_MPI_VERSION=159,10909 +export LMOD_FAMILY_MPI_VERSION;160,10943 +LOADEDMODULES=161,10975 +export LOADEDMODULES;162,11073 +__LMOD_REF_COUNT_MANPATH=163,11095 +export __LMOD_REF_COUNT_MANPATH;164,11466 +MANPATH=165,11499 +export MANPATH;166,11818 +__LMOD_REF_COUNT_MODULEPATH=167,11834 +export __LMOD_REF_COUNT_MODULEPATH;168,11999 +MODULEPATH=169,12035 +export MODULEPATH;170,12175 +MPICH_HOME=171,12194 +export MPICH_HOME;172,12244 +MYPROXY_SERVER=173,12263 +export MYPROXY_SERVER;174,12300 +NAME=175,12323 +export NAME;176,12343 +__LMOD_REF_COUNT_PATH=177,12356 +export __LMOD_REF_COUNT_PATH;178,12739 +PATH=179,12769 +export PATH;180,13103 +PGI=181,13116 +export PGI;182,13143 +PURGE=183,13155 +export PURGE;184,13166 +RSHCOMMAND=185,13180 +export RSHCOMMAND;186,13237 +SASL_PATH=187,13256 +export SASL_PATH;188,13309 +__LMOD_REF_COUNT_SHLIB_PATH=189,13327 +export __LMOD_REF_COUNT_SHLIB_PATH;190,13455 +SHLIB_PATH=191,13491 +export SHLIB_PATH;192,13597 +STTY_ARGS=193,13616 +export STTY_ARGS;194,13632 +SYSTEM=195,13650 +export SYSTEM;196,13664 +USER_SHELL=197,13679 +export USER_SHELL;198,13696 +_LMFILES_=199,13715 +export _LMFILES_;200,14053 +_ModuleTable_=201,14071 +export _ModuleTable_;202,15924 +export MODULEPATH;208,16212 +_ModuleTable_=209,16231 +export _ModuleTable_;210,18084 rt/category/category.tdesc,21 local testName 2,15 @@ -12959,7 +13114,7 @@ export _ModuleTable_;30,1356 rt/checkSyntax/checkSyntax.tdesc,21 local testName 2,15 -rt/hook_avail/out.txt,3414 +rt/hook_avail/out.txt,3418 export AR;10,325 CC=11,336 export CC;12,396 @@ -13018,71 +13173,71 @@ export PATH;64,4014 _LMFILES_=65,4027 export _LMFILES_;66,4333 _ModuleTable_=67,4351 -export _ModuleTable_;68,5844 -export MODULEPATH;74,6180 -_ModuleTable_=75,6199 -export _ModuleTable_;76,7692 -export AR;82,7902 -CC=83,7913 -export CC;84,7973 -CPATH=85,7984 -export CPATH;86,8078 -CXX=87,8092 -export CXX;88,8154 -F77=89,8166 -export F77;90,8229 -FC=91,8241 -export FC;92,8303 -INTEL_LICENSE_FILE=93,8314 -export INTEL_LICENSE_FILE;94,8352 -LD=95,8379 -export LD;96,8440 -LD_LIBRARY_PATH=97,8451 -export LD_LIBRARY_PATH;98,8649 -LIBRARY_PATH=99,8673 -export LIBRARY_PATH;100,8868 -LMOD_FAMILY_COMPILERS=101,8889 -export LMOD_FAMILY_COMPILERS;102,8928 -LMOD_FAMILY_COMPILERS_VERSION=103,8958 -export LMOD_FAMILY_COMPILERS_VERSION;104,8994 -LMOD_FAMILY_MOAB=105,9032 -export LMOD_FAMILY_MOAB;106,9060 -LMOD_FAMILY_MOAB_VERSION=107,9085 -export LMOD_FAMILY_MOAB_VERSION;108,9117 -LMOD_FAMILY_MPI=109,9150 -export LMOD_FAMILY_MPI;110,9179 -LMOD_FAMILY_MPI_VERSION=111,9203 -export LMOD_FAMILY_MPI_VERSION;112,9234 -MANPATH=113,9266 -export MANPATH;114,9460 -MOABHOMEDIR=115,9476 -export MOABHOMEDIR;116,9525 -MODULEPATH=117,9545 -export MODULEPATH;118,9733 -OMPI_MCA_plm_rsh_num_concurrent=119,9752 -export OMPI_MCA_plm_rsh_num_concurrent;120,9789 -PATH=121,9829 -export PATH;122,10028 -_ModuleTable_=123,10041 -export _ModuleTable_;124,11534 -export MODULEPATH;130,11871 -_ModuleTable_=131,11890 -export _ModuleTable_;132,13383 -export MODULEPATH;138,13734 -_ModuleTable_=139,13753 -export _ModuleTable_;140,15246 -export MODULEPATH;146,15583 -_ModuleTable_=147,15602 -export _ModuleTable_;148,17095 -export MODULEPATH;154,17432 -_ModuleTable_=155,17451 -export _ModuleTable_;156,18944 -export MODULEPATH;162,19281 -_ModuleTable_=163,19300 -export _ModuleTable_;164,20793 -export MODULEPATH;170,21134 -_ModuleTable_=171,21153 -export _ModuleTable_;172,22646 +export _ModuleTable_;68,6039 +export MODULEPATH;74,6375 +_ModuleTable_=75,6394 +export _ModuleTable_;76,8082 +export AR;82,8292 +CC=83,8303 +export CC;84,8363 +CPATH=85,8374 +export CPATH;86,8468 +CXX=87,8482 +export CXX;88,8544 +F77=89,8556 +export F77;90,8619 +FC=91,8631 +export FC;92,8693 +INTEL_LICENSE_FILE=93,8704 +export INTEL_LICENSE_FILE;94,8742 +LD=95,8769 +export LD;96,8830 +LD_LIBRARY_PATH=97,8841 +export LD_LIBRARY_PATH;98,9039 +LIBRARY_PATH=99,9063 +export LIBRARY_PATH;100,9258 +LMOD_FAMILY_COMPILERS=101,9279 +export LMOD_FAMILY_COMPILERS;102,9318 +LMOD_FAMILY_COMPILERS_VERSION=103,9348 +export LMOD_FAMILY_COMPILERS_VERSION;104,9384 +LMOD_FAMILY_MOAB=105,9422 +export LMOD_FAMILY_MOAB;106,9450 +LMOD_FAMILY_MOAB_VERSION=107,9475 +export LMOD_FAMILY_MOAB_VERSION;108,9507 +LMOD_FAMILY_MPI=109,9540 +export LMOD_FAMILY_MPI;110,9569 +LMOD_FAMILY_MPI_VERSION=111,9593 +export LMOD_FAMILY_MPI_VERSION;112,9624 +MANPATH=113,9656 +export MANPATH;114,9850 +MOABHOMEDIR=115,9866 +export MOABHOMEDIR;116,9915 +MODULEPATH=117,9935 +export MODULEPATH;118,10123 +OMPI_MCA_plm_rsh_num_concurrent=119,10142 +export OMPI_MCA_plm_rsh_num_concurrent;120,10179 +PATH=121,10219 +export PATH;122,10418 +_ModuleTable_=123,10431 +export _ModuleTable_;124,12119 +export MODULEPATH;130,12456 +_ModuleTable_=131,12475 +export _ModuleTable_;132,14163 +export MODULEPATH;138,14514 +_ModuleTable_=139,14533 +export _ModuleTable_;140,16221 +export MODULEPATH;146,16558 +_ModuleTable_=147,16577 +export _ModuleTable_;148,18265 +export MODULEPATH;154,18602 +_ModuleTable_=155,18621 +export _ModuleTable_;156,20309 +export MODULEPATH;162,20646 +_ModuleTable_=163,20665 +export _ModuleTable_;164,22353 +export MODULEPATH;170,22694 +_ModuleTable_=171,22713 +export _ModuleTable_;172,24401 rt/hook_avail/SitePackage.lua,28 function avail_hook(18,315 @@ -13108,47 +13263,47 @@ export MODULEPATH;28,1150 _LMFILES_=29,1169 export _LMFILES_;30,1228 _ModuleTable_=31,1246 -export _ModuleTable_;32,1618 -export LOADEDMODULES;38,1815 -MODULEPATH=39,1837 -export MODULEPATH;40,1931 -__LMOD_REF_COUNT_PATH=41,1950 -export __LMOD_REF_COUNT_PATH;42,2043 -PATH=43,2073 -export PATH;44,2141 -TACC_GIT_BIN=45,2154 -export TACC_GIT_BIN;46,2198 -TACC_GIT_DIR=47,2219 -export TACC_GIT_DIR;48,2260 -TACC_GIT_LIB=49,2281 -export TACC_GIT_LIB;50,2325 -_LMFILES_=51,2346 -export _LMFILES_;52,2455 -_ModuleTable_=53,2473 -export _ModuleTable_;54,3056 -export LOADEDMODULES;60,3253 -MODULEPATH=61,3275 -export MODULEPATH;62,3369 -_LMFILES_=63,3388 -export _LMFILES_;64,3543 -_ModuleTable_=65,3561 -export _ModuleTable_;66,4319 -bar=67,4341 -export bar;68,4350 -export LOADEDMODULES;74,4551 -MODULEPATH=75,4573 -export MODULEPATH;76,4667 -VERSION=77,4686 -export VERSION;78,4699 -_LMFILES_=79,4715 -export _LMFILES_;80,4919 -_ModuleTable_=81,4937 -export _ModuleTable_;82,5882 +export _ModuleTable_;32,1712 +export LOADEDMODULES;38,1909 +MODULEPATH=39,1931 +export MODULEPATH;40,2025 +__LMOD_REF_COUNT_PATH=41,2044 +export __LMOD_REF_COUNT_PATH;42,2137 +PATH=43,2167 +export PATH;44,2235 +TACC_GIT_BIN=45,2248 +export TACC_GIT_BIN;46,2292 +TACC_GIT_DIR=47,2313 +export TACC_GIT_DIR;48,2354 +TACC_GIT_LIB=49,2375 +export TACC_GIT_LIB;50,2419 +_LMFILES_=51,2440 +export _LMFILES_;52,2549 +_ModuleTable_=53,2567 +export _ModuleTable_;54,3244 +export LOADEDMODULES;60,3441 +MODULEPATH=61,3463 +export MODULEPATH;62,3557 +_LMFILES_=63,3576 +export _LMFILES_;64,3731 +_ModuleTable_=65,3749 +export _ModuleTable_;66,4601 +bar=67,4623 +export bar;68,4632 +export LOADEDMODULES;74,4833 +MODULEPATH=75,4855 +export MODULEPATH;76,4949 +VERSION=77,4968 +export VERSION;78,4981 +_LMFILES_=79,4997 +export _LMFILES_;80,5201 +_ModuleTable_=81,5219 +export _ModuleTable_;82,6258 rt/deprecation/deprecation.tdesc,19 testdescript 3,16 -rt/multiL/out.txt,4419 +rt/multiL/out.txt,4428 export __LMOD_REF_COUNT_MODULEPATH;10,318 MODULEPATH=11,354 export MODULEPATH;12,395 @@ -13169,128 +13324,128 @@ export MODULEPATH;36,1505 _LMFILES_=37,1524 export _LMFILES_;38,1584 _ModuleTable_=39,1602 -export _ModuleTable_;40,2035 -export MODULEPATH;46,2263 -_ModuleTable_=47,2282 -export _ModuleTable_;48,2715 -export LMOD_FAMILY_MPI;54,2902 -LMOD_FAMILY_MPI_VERSION=55,2926 -export LMOD_FAMILY_MPI_VERSION;56,2957 -LOADEDMODULES=57,2989 -export LOADEDMODULES;58,3037 -__LMOD_REF_COUNT_MODULEPATH=59,3059 -export __LMOD_REF_COUNT_MODULEPATH;60,3216 -MODULEPATH=61,3252 -export MODULEPATH;62,3384 -_LMFILES_=63,3403 -export _LMFILES_;64,3522 -_ModuleTable_=65,3540 -export _ModuleTable_;66,4270 -export LOADEDMODULES;72,4496 -MODULEPATH=73,4518 -export MODULEPATH;74,4650 -TACC_PETSC_VERSION=75,4669 -export TACC_PETSC_VERSION;76,4693 -_LMFILES_=77,4720 -export _LMFILES_;78,4913 -_ModuleTable_=79,4931 -export _ModuleTable_;80,5895 -export MODULEPATH;86,6175 -_ModuleTable_=87,6194 -export _ModuleTable_;88,7158 -export MODULEPATH;94,7439 -_ModuleTable_=95,7458 -export _ModuleTable_;96,8422 -unset LMOD_FAMILY_COMPILER_VERSION;102,8611 -unset LMOD_FAMILY_MPI;103,8647 -unset LMOD_FAMILY_MPI_VERSION;104,8670 -unset LOADEDMODULES;105,8701 -__LMOD_REF_COUNT_MODULEPATH=106,8722 -export __LMOD_REF_COUNT_MODULEPATH;107,8782 -MODULEPATH=108,8818 -export MODULEPATH;109,8859 -unset TACC_PETSC_VERSION;110,8878 -unset _LMFILES_;111,8904 -_ModuleTable_=112,8921 -export _ModuleTable_;113,9546 -export LMOD_FAMILY_COMPILER;119,9737 -LMOD_FAMILY_COMPILER_VERSION=120,9766 -export LMOD_FAMILY_COMPILER_VERSION;121,9802 -LMOD_FAMILY_MPI=122,9839 -export LMOD_FAMILY_MPI;123,9867 -LMOD_FAMILY_MPI_VERSION=124,9891 -export LMOD_FAMILY_MPI_VERSION;125,9922 -LOADEDMODULES=126,9954 -export LOADEDMODULES;127,10019 -__LMOD_REF_COUNT_MODULEPATH=128,10041 -export __LMOD_REF_COUNT_MODULEPATH;129,10198 -MODULEPATH=130,10234 -export MODULEPATH;131,10366 -TACC_PETSC_VERSION=132,10385 -export TACC_PETSC_VERSION;133,10409 -_LMFILES_=134,10436 -export _LMFILES_;135,10629 -_ModuleTable_=136,10647 -export _ModuleTable_;137,11611 -export LMOD_FAMILY_COMPILER;143,11816 -LMOD_FAMILY_COMPILER_VERSION=144,11845 -export LMOD_FAMILY_COMPILER_VERSION;145,11880 -LMOD_FAMILY_MPI=146,11917 -export LMOD_FAMILY_MPI;147,11945 -LMOD_FAMILY_MPI_VERSION=148,11969 -export LMOD_FAMILY_MPI_VERSION;149,12000 -LOADEDMODULES=150,12032 -export LOADEDMODULES;151,12098 -__LMOD_REF_COUNT_MODULEPATH=152,12120 -export __LMOD_REF_COUNT_MODULEPATH;153,12283 -MODULEPATH=154,12319 -export MODULEPATH;155,12457 -TACC_PETSC_VERSION=156,12476 -export TACC_PETSC_VERSION;157,12500 -_LMFILES_=158,12527 -export _LMFILES_;159,12727 -_ModuleTable_=160,12745 -export _ModuleTable_;161,13719 -export MODULEPATH;167,14006 -_ModuleTable_=168,14025 -export _ModuleTable_;169,14999 -unset LMOD_FAMILY_COMPILER_VERSION;175,15195 -unset LMOD_FAMILY_MPI;176,15231 -unset LMOD_FAMILY_MPI_VERSION;177,15254 -unset LOADEDMODULES;178,15285 -__LMOD_REF_COUNT_MODULEPATH=179,15306 -export __LMOD_REF_COUNT_MODULEPATH;180,15366 -MODULEPATH=181,15402 -export MODULEPATH;182,15443 -unset TACC_PETSC_VERSION;183,15462 -unset _LMFILES_;184,15488 -_ModuleTable_=185,15505 -export _ModuleTable_;186,16136 -export MODULEPATH;192,16326 -_ModuleTable_=193,16345 -export _ModuleTable_;194,16976 -export LMOD_FAMILY_COMPILER;200,17176 -LMOD_FAMILY_COMPILER_VERSION=201,17205 -export LMOD_FAMILY_COMPILER_VERSION;202,17240 -LMOD_FAMILY_MPI=203,17277 -export LMOD_FAMILY_MPI;204,17305 -LMOD_FAMILY_MPI_VERSION=205,17329 -export LMOD_FAMILY_MPI_VERSION;206,17360 -LOADEDMODULES=207,17392 -export LOADEDMODULES;208,17458 -__LMOD_REF_COUNT_MODULEPATH=209,17480 -export __LMOD_REF_COUNT_MODULEPATH;210,17643 -MODULEPATH=211,17679 -export MODULEPATH;212,17817 -TACC_PETSC_VERSION=213,17836 -export TACC_PETSC_VERSION;214,17860 -_LMFILES_=215,17887 -export _LMFILES_;216,18087 -_ModuleTable_=217,18105 -export _ModuleTable_;218,19084 -export MODULEPATH;224,19371 -_ModuleTable_=225,19390 -export _ModuleTable_;226,20369 +export _ModuleTable_;40,2119 +export MODULEPATH;46,2347 +_ModuleTable_=47,2366 +export _ModuleTable_;48,2883 +export LMOD_FAMILY_MPI;54,3070 +LMOD_FAMILY_MPI_VERSION=55,3094 +export LMOD_FAMILY_MPI_VERSION;56,3125 +LOADEDMODULES=57,3157 +export LOADEDMODULES;58,3205 +__LMOD_REF_COUNT_MODULEPATH=59,3227 +export __LMOD_REF_COUNT_MODULEPATH;60,3384 +MODULEPATH=61,3420 +export MODULEPATH;62,3552 +_LMFILES_=63,3571 +export _LMFILES_;64,3690 +_ModuleTable_=65,3708 +export _ModuleTable_;66,4621 +export LOADEDMODULES;72,4847 +MODULEPATH=73,4869 +export MODULEPATH;74,5001 +TACC_PETSC_VERSION=75,5020 +export TACC_PETSC_VERSION;76,5044 +_LMFILES_=77,5071 +export _LMFILES_;78,5264 +_ModuleTable_=79,5282 +export _ModuleTable_;80,6429 +export MODULEPATH;86,6709 +_ModuleTable_=87,6728 +export _ModuleTable_;88,7875 +export MODULEPATH;94,8156 +_ModuleTable_=95,8175 +export _ModuleTable_;96,9322 +unset LMOD_FAMILY_COMPILER_VERSION;102,9511 +unset LMOD_FAMILY_MPI;103,9547 +unset LMOD_FAMILY_MPI_VERSION;104,9570 +unset LOADEDMODULES;105,9601 +__LMOD_REF_COUNT_MODULEPATH=106,9622 +export __LMOD_REF_COUNT_MODULEPATH;107,9682 +MODULEPATH=108,9718 +export MODULEPATH;109,9759 +unset TACC_PETSC_VERSION;110,9778 +unset _LMFILES_;111,9804 +_ModuleTable_=112,9821 +export _ModuleTable_;113,10446 +export LMOD_FAMILY_COMPILER;119,10637 +LMOD_FAMILY_COMPILER_VERSION=120,10666 +export LMOD_FAMILY_COMPILER_VERSION;121,10702 +LMOD_FAMILY_MPI=122,10739 +export LMOD_FAMILY_MPI;123,10767 +LMOD_FAMILY_MPI_VERSION=124,10791 +export LMOD_FAMILY_MPI_VERSION;125,10822 +LOADEDMODULES=126,10854 +export LOADEDMODULES;127,10919 +__LMOD_REF_COUNT_MODULEPATH=128,10941 +export __LMOD_REF_COUNT_MODULEPATH;129,11098 +MODULEPATH=130,11134 +export MODULEPATH;131,11266 +TACC_PETSC_VERSION=132,11285 +export TACC_PETSC_VERSION;133,11309 +_LMFILES_=134,11336 +export _LMFILES_;135,11529 +_ModuleTable_=136,11547 +export _ModuleTable_;137,12694 +export LMOD_FAMILY_COMPILER;143,12899 +LMOD_FAMILY_COMPILER_VERSION=144,12928 +export LMOD_FAMILY_COMPILER_VERSION;145,12963 +LMOD_FAMILY_MPI=146,13000 +export LMOD_FAMILY_MPI;147,13028 +LMOD_FAMILY_MPI_VERSION=148,13052 +export LMOD_FAMILY_MPI_VERSION;149,13083 +LOADEDMODULES=150,13115 +export LOADEDMODULES;151,13181 +__LMOD_REF_COUNT_MODULEPATH=152,13203 +export __LMOD_REF_COUNT_MODULEPATH;153,13366 +MODULEPATH=154,13402 +export MODULEPATH;155,13540 +TACC_PETSC_VERSION=156,13559 +export TACC_PETSC_VERSION;157,13583 +_LMFILES_=158,13610 +export _LMFILES_;159,13810 +_ModuleTable_=160,13828 +export _ModuleTable_;161,14991 +export MODULEPATH;167,15278 +_ModuleTable_=168,15297 +export _ModuleTable_;169,16460 +unset LMOD_FAMILY_COMPILER_VERSION;175,16656 +unset LMOD_FAMILY_MPI;176,16692 +unset LMOD_FAMILY_MPI_VERSION;177,16715 +unset LOADEDMODULES;178,16746 +__LMOD_REF_COUNT_MODULEPATH=179,16767 +export __LMOD_REF_COUNT_MODULEPATH;180,16827 +MODULEPATH=181,16863 +export MODULEPATH;182,16904 +unset TACC_PETSC_VERSION;183,16923 +unset _LMFILES_;184,16949 +_ModuleTable_=185,16966 +export _ModuleTable_;186,17597 +export MODULEPATH;192,17787 +_ModuleTable_=193,17806 +export _ModuleTable_;194,18437 +export LMOD_FAMILY_COMPILER;200,18637 +LMOD_FAMILY_COMPILER_VERSION=201,18666 +export LMOD_FAMILY_COMPILER_VERSION;202,18701 +LMOD_FAMILY_MPI=203,18738 +export LMOD_FAMILY_MPI;204,18766 +LMOD_FAMILY_MPI_VERSION=205,18790 +export LMOD_FAMILY_MPI_VERSION;206,18821 +LOADEDMODULES=207,18853 +export LOADEDMODULES;208,18919 +__LMOD_REF_COUNT_MODULEPATH=209,18941 +export __LMOD_REF_COUNT_MODULEPATH;210,19104 +MODULEPATH=211,19140 +export MODULEPATH;212,19278 +TACC_PETSC_VERSION=213,19297 +export TACC_PETSC_VERSION;214,19321 +_LMFILES_=215,19348 +export _LMFILES_;216,19548 +_ModuleTable_=217,19566 +export _ModuleTable_;218,20734 +export MODULEPATH;224,21021 +_ModuleTable_=225,21040 +export _ModuleTable_;226,22208 rt/multiL/multiL.tdesc,21 local testName 2,15 @@ -13781,20 +13936,20 @@ export MODULEPATH;14,541 _LMFILES_=15,560 export _LMFILES_;16,625 _ModuleTable_=17,643 -export _ModuleTable_;18,1071 -export MODULEPATH;24,1303 -_ModuleTable_=25,1322 -export _ModuleTable_;26,1750 -export MODULEPATH;32,1981 -_ModuleTable_=33,2000 -export _ModuleTable_;34,2428 -__LMOD_REF_COUNT_MODULEPATH=40,2667 -export __LMOD_REF_COUNT_MODULEPATH;41,2730 -MODULEPATH=42,2766 -export MODULEPATH;43,2810 -unset _LMFILES_;44,2829 -_ModuleTable_=45,2846 -export _ModuleTable_;46,3219 +export _ModuleTable_;18,1152 +export MODULEPATH;24,1384 +_ModuleTable_=25,1403 +export _ModuleTable_;26,1912 +export MODULEPATH;32,2143 +_ModuleTable_=33,2162 +export _ModuleTable_;34,2671 +__LMOD_REF_COUNT_MODULEPATH=40,2910 +export __LMOD_REF_COUNT_MODULEPATH;41,2973 +MODULEPATH=42,3009 +export MODULEPATH;43,3053 +unset _LMFILES_;44,3072 +_ModuleTable_=45,3089 +export _ModuleTable_;46,3462 rt/rmap/site/SitePackage.lua,46 local function l_reverseMapPathFilter(12,152 @@ -13844,7 +13999,7 @@ xlibmap 686,18625 reverseMapT 694,18768 xlibmap 712,19190 -rt/changeMPATH/out.txt,6151 +rt/changeMPATH/out.txt,6153 export ADMIN_MODULE_LOADED;10,293 __LMOD_REF_COUNT_INFOPATH=11,321 export __LMOD_REF_COUNT_INFOPATH;12,381 @@ -13879,170 +14034,170 @@ export PATH;40,2316 _LMFILES_=41,2329 export _LMFILES_;42,2635 _ModuleTable_=43,2653 -export _ModuleTable_;44,3971 -export MODULEPATH;50,4222 -_ModuleTable_=51,4241 -export _ModuleTable_;52,5559 -unset __LMOD_REF_COUNT_INFOPATH;58,5735 -unset INFOPATH;59,5768 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;60,5784 -unset LD_LIBRARY_PATH;61,5824 -unset LMOD_FAMILY_COMPILER;62,5847 -unset LMOD_FAMILY_COMPILER_VERSION;63,5875 -unset LOADEDMODULES;64,5911 -unset __LMOD_REF_COUNT_MANPATH;65,5932 -unset MANPATH;66,5964 -unset MKL_DIR;67,5979 -unset MKL_INCLUDE;68,5994 -__LMOD_REF_COUNT_MODULEPATH=69,6013 -export __LMOD_REF_COUNT_MODULEPATH;70,6078 -MODULEPATH=71,6114 -export MODULEPATH;72,6160 -__LMOD_REF_COUNT_PATH=73,6179 -export __LMOD_REF_COUNT_PATH;74,6239 -PATH=75,6269 -export PATH;76,6307 -unset _LMFILES_;77,6320 -_ModuleTable_=78,6337 -export _ModuleTable_;79,6507 -export __LMOD_REF_COUNT_MODULEPATH;90,6894 -MODULEPATH=91,6930 -export MODULEPATH;92,7011 -_ModuleTable_=93,7030 -export _ModuleTable_;94,7272 -export __LMOD_REF_COUNT_MODULEPATH;100,7557 -MODULEPATH=101,7593 -export MODULEPATH;102,7674 -_ModuleTable_=103,7693 -export _ModuleTable_;104,7900 -export ADMIN_MODULE_LOADED;110,8084 -__LMOD_REF_COUNT_INFOPATH=111,8112 -export __LMOD_REF_COUNT_INFOPATH;112,8172 -INFOPATH=113,8206 -export INFOPATH;114,8244 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=115,8261 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;116,8422 -LD_LIBRARY_PATH=117,8463 -export LD_LIBRARY_PATH;118,8596 -LMOD_FAMILY_COMPILER=119,8620 -export LMOD_FAMILY_COMPILER;120,8648 -LMOD_FAMILY_COMPILER_VERSION=121,8677 -export LMOD_FAMILY_COMPILER_VERSION;122,8713 -LOADEDMODULES=123,8750 -export LOADEDMODULES;124,8832 -__LMOD_REF_COUNT_MANPATH=125,8854 -export __LMOD_REF_COUNT_MANPATH;126,9051 -MANPATH=127,9084 -export MANPATH;128,9247 -MKL_DIR=129,9263 -export MKL_DIR;130,9305 -MKL_INCLUDE=131,9321 -export MKL_INCLUDE;132,9367 -__LMOD_REF_COUNT_MODULEPATH=133,9387 -export __LMOD_REF_COUNT_MODULEPATH;134,9542 -MODULEPATH=135,9578 -export MODULEPATH;136,9708 -__LMOD_REF_COUNT_PATH=137,9727 -export __LMOD_REF_COUNT_PATH;138,9960 -PATH=139,9990 -export PATH;140,10180 -_LMFILES_=141,10193 -export _LMFILES_;142,10500 -_ModuleTable_=143,10518 -export _ModuleTable_;144,11874 -export MODULEPATH;150,12152 -_ModuleTable_=151,12171 -export _ModuleTable_;152,13527 -export MODULEPATH;158,13814 -_ModuleTable_=159,13833 -export _ModuleTable_;160,15189 -unset __LMOD_REF_COUNT_INFOPATH;166,15366 -unset INFOPATH;167,15399 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;168,15415 -unset LD_LIBRARY_PATH;169,15455 -unset LMOD_FAMILY_COMPILER;170,15478 -unset LMOD_FAMILY_COMPILER_VERSION;171,15506 -unset LOADEDMODULES;172,15542 -unset __LMOD_REF_COUNT_MANPATH;173,15563 -unset MANPATH;174,15595 -unset MKL_DIR;175,15610 -unset MKL_INCLUDE;176,15625 -__LMOD_REF_COUNT_MODULEPATH=177,15644 -export __LMOD_REF_COUNT_MODULEPATH;178,15747 -MODULEPATH=179,15783 -export MODULEPATH;180,15864 -__LMOD_REF_COUNT_PATH=181,15883 -export __LMOD_REF_COUNT_PATH;182,15943 -PATH=183,15973 -export PATH;184,16011 -unset _LMFILES_;185,16024 -_ModuleTable_=186,16041 -export _ModuleTable_;187,16248 -export ADMIN_MODULE_LOADED;193,16423 -__LMOD_REF_COUNT_INFOPATH=194,16451 -export __LMOD_REF_COUNT_INFOPATH;195,16511 -INFOPATH=196,16545 -export INFOPATH;197,16583 -__LMOD_REF_COUNT_LD_LIBRARY_PATH=198,16600 -export __LMOD_REF_COUNT_LD_LIBRARY_PATH;199,16761 -LD_LIBRARY_PATH=200,16802 -export LD_LIBRARY_PATH;201,16935 -LMOD_FAMILY_COMPILER=202,16959 -export LMOD_FAMILY_COMPILER;203,16987 -LMOD_FAMILY_COMPILER_VERSION=204,17016 -export LMOD_FAMILY_COMPILER_VERSION;205,17052 -LOADEDMODULES=206,17089 -export LOADEDMODULES;207,17171 -__LMOD_REF_COUNT_MANPATH=208,17193 -export __LMOD_REF_COUNT_MANPATH;209,17390 -MANPATH=210,17423 -export MANPATH;211,17586 -MKL_DIR=212,17602 -export MKL_DIR;213,17644 -MKL_INCLUDE=214,17660 -export MKL_INCLUDE;215,17706 -__LMOD_REF_COUNT_MODULEPATH=216,17726 -export __LMOD_REF_COUNT_MODULEPATH;217,17881 -MODULEPATH=218,17917 -export MODULEPATH;219,18047 -__LMOD_REF_COUNT_PATH=220,18066 -export __LMOD_REF_COUNT_PATH;221,18299 -PATH=222,18329 -export PATH;223,18519 -_LMFILES_=224,18532 -export _LMFILES_;225,18839 -_ModuleTable_=226,18857 -export _ModuleTable_;227,20213 -__LMOD_DEFAULT_MODULES_LOADED__=228,20235 -export __LMOD_DEFAULT_MODULES_LOADED__;229,20270 -export MODULEPATH;235,20567 -_ModuleTable_=236,20586 -export _ModuleTable_;237,21942 -export MODULEPATH;243,22225 -_ModuleTable_=244,22244 -export _ModuleTable_;245,23600 -unset __LMOD_REF_COUNT_INFOPATH;251,23777 -unset INFOPATH;252,23810 -unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;253,23826 -unset LD_LIBRARY_PATH;254,23866 -unset LMOD_FAMILY_COMPILER;255,23889 -unset LMOD_FAMILY_COMPILER_VERSION;256,23917 -unset LOADEDMODULES;257,23953 -unset __LMOD_REF_COUNT_MANPATH;258,23974 -unset MANPATH;259,24006 -unset MKL_DIR;260,24021 -unset MKL_INCLUDE;261,24036 -__LMOD_REF_COUNT_MODULEPATH=262,24055 -export __LMOD_REF_COUNT_MODULEPATH;263,24120 -MODULEPATH=264,24156 -export MODULEPATH;265,24202 -__LMOD_REF_COUNT_PATH=266,24221 -export __LMOD_REF_COUNT_PATH;267,24281 -PATH=268,24311 -export PATH;269,24349 -unset _LMFILES_;270,24362 -_ModuleTable_=271,24379 -export _ModuleTable_;272,24549 +export _ModuleTable_;44,4066 +export MODULEPATH;50,4317 +_ModuleTable_=51,4336 +export _ModuleTable_;52,5749 +unset __LMOD_REF_COUNT_INFOPATH;58,5925 +unset INFOPATH;59,5958 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;60,5974 +unset LD_LIBRARY_PATH;61,6014 +unset LMOD_FAMILY_COMPILER;62,6037 +unset LMOD_FAMILY_COMPILER_VERSION;63,6065 +unset LOADEDMODULES;64,6101 +unset __LMOD_REF_COUNT_MANPATH;65,6122 +unset MANPATH;66,6154 +unset MKL_DIR;67,6169 +unset MKL_INCLUDE;68,6184 +__LMOD_REF_COUNT_MODULEPATH=69,6203 +export __LMOD_REF_COUNT_MODULEPATH;70,6268 +MODULEPATH=71,6304 +export MODULEPATH;72,6350 +__LMOD_REF_COUNT_PATH=73,6369 +export __LMOD_REF_COUNT_PATH;74,6429 +PATH=75,6459 +export PATH;76,6497 +unset _LMFILES_;77,6510 +_ModuleTable_=78,6527 +export _ModuleTable_;79,6697 +export __LMOD_REF_COUNT_MODULEPATH;90,7084 +MODULEPATH=91,7120 +export MODULEPATH;92,7201 +_ModuleTable_=93,7220 +export _ModuleTable_;94,7462 +export __LMOD_REF_COUNT_MODULEPATH;100,7747 +MODULEPATH=101,7783 +export MODULEPATH;102,7864 +_ModuleTable_=103,7883 +export _ModuleTable_;104,8090 +export ADMIN_MODULE_LOADED;110,8274 +__LMOD_REF_COUNT_INFOPATH=111,8302 +export __LMOD_REF_COUNT_INFOPATH;112,8362 +INFOPATH=113,8396 +export INFOPATH;114,8434 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=115,8451 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;116,8612 +LD_LIBRARY_PATH=117,8653 +export LD_LIBRARY_PATH;118,8786 +LMOD_FAMILY_COMPILER=119,8810 +export LMOD_FAMILY_COMPILER;120,8838 +LMOD_FAMILY_COMPILER_VERSION=121,8867 +export LMOD_FAMILY_COMPILER_VERSION;122,8903 +LOADEDMODULES=123,8940 +export LOADEDMODULES;124,9022 +__LMOD_REF_COUNT_MANPATH=125,9044 +export __LMOD_REF_COUNT_MANPATH;126,9241 +MANPATH=127,9274 +export MANPATH;128,9437 +MKL_DIR=129,9453 +export MKL_DIR;130,9495 +MKL_INCLUDE=131,9511 +export MKL_INCLUDE;132,9557 +__LMOD_REF_COUNT_MODULEPATH=133,9577 +export __LMOD_REF_COUNT_MODULEPATH;134,9732 +MODULEPATH=135,9768 +export MODULEPATH;136,9898 +__LMOD_REF_COUNT_PATH=137,9917 +export __LMOD_REF_COUNT_PATH;138,10150 +PATH=139,10180 +export PATH;140,10370 +_LMFILES_=141,10383 +export _LMFILES_;142,10690 +_ModuleTable_=143,10708 +export _ModuleTable_;144,12159 +export MODULEPATH;150,12437 +_ModuleTable_=151,12456 +export _ModuleTable_;152,13907 +export MODULEPATH;158,14194 +_ModuleTable_=159,14213 +export _ModuleTable_;160,15664 +unset __LMOD_REF_COUNT_INFOPATH;166,15841 +unset INFOPATH;167,15874 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;168,15890 +unset LD_LIBRARY_PATH;169,15930 +unset LMOD_FAMILY_COMPILER;170,15953 +unset LMOD_FAMILY_COMPILER_VERSION;171,15981 +unset LOADEDMODULES;172,16017 +unset __LMOD_REF_COUNT_MANPATH;173,16038 +unset MANPATH;174,16070 +unset MKL_DIR;175,16085 +unset MKL_INCLUDE;176,16100 +__LMOD_REF_COUNT_MODULEPATH=177,16119 +export __LMOD_REF_COUNT_MODULEPATH;178,16222 +MODULEPATH=179,16258 +export MODULEPATH;180,16339 +__LMOD_REF_COUNT_PATH=181,16358 +export __LMOD_REF_COUNT_PATH;182,16418 +PATH=183,16448 +export PATH;184,16486 +unset _LMFILES_;185,16499 +_ModuleTable_=186,16516 +export _ModuleTable_;187,16723 +export ADMIN_MODULE_LOADED;193,16898 +__LMOD_REF_COUNT_INFOPATH=194,16926 +export __LMOD_REF_COUNT_INFOPATH;195,16986 +INFOPATH=196,17020 +export INFOPATH;197,17058 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=198,17075 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;199,17236 +LD_LIBRARY_PATH=200,17277 +export LD_LIBRARY_PATH;201,17410 +LMOD_FAMILY_COMPILER=202,17434 +export LMOD_FAMILY_COMPILER;203,17462 +LMOD_FAMILY_COMPILER_VERSION=204,17491 +export LMOD_FAMILY_COMPILER_VERSION;205,17527 +LOADEDMODULES=206,17564 +export LOADEDMODULES;207,17646 +__LMOD_REF_COUNT_MANPATH=208,17668 +export __LMOD_REF_COUNT_MANPATH;209,17865 +MANPATH=210,17898 +export MANPATH;211,18061 +MKL_DIR=212,18077 +export MKL_DIR;213,18119 +MKL_INCLUDE=214,18135 +export MKL_INCLUDE;215,18181 +__LMOD_REF_COUNT_MODULEPATH=216,18201 +export __LMOD_REF_COUNT_MODULEPATH;217,18356 +MODULEPATH=218,18392 +export MODULEPATH;219,18522 +__LMOD_REF_COUNT_PATH=220,18541 +export __LMOD_REF_COUNT_PATH;221,18774 +PATH=222,18804 +export PATH;223,18994 +_LMFILES_=224,19007 +export _LMFILES_;225,19314 +_ModuleTable_=226,19332 +export _ModuleTable_;227,20783 +__LMOD_DEFAULT_MODULES_LOADED__=228,20805 +export __LMOD_DEFAULT_MODULES_LOADED__;229,20840 +export MODULEPATH;235,21137 +_ModuleTable_=236,21156 +export _ModuleTable_;237,22607 +export MODULEPATH;243,22890 +_ModuleTable_=244,22909 +export _ModuleTable_;245,24360 +unset __LMOD_REF_COUNT_INFOPATH;251,24537 +unset INFOPATH;252,24570 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;253,24586 +unset LD_LIBRARY_PATH;254,24626 +unset LMOD_FAMILY_COMPILER;255,24649 +unset LMOD_FAMILY_COMPILER_VERSION;256,24677 +unset LOADEDMODULES;257,24713 +unset __LMOD_REF_COUNT_MANPATH;258,24734 +unset MANPATH;259,24766 +unset MKL_DIR;260,24781 +unset MKL_INCLUDE;261,24796 +__LMOD_REF_COUNT_MODULEPATH=262,24815 +export __LMOD_REF_COUNT_MODULEPATH;263,24880 +MODULEPATH=264,24916 +export MODULEPATH;265,24962 +__LMOD_REF_COUNT_PATH=266,24981 +export __LMOD_REF_COUNT_PATH;267,25041 +PATH=268,25071 +export PATH;269,25109 +unset _LMFILES_;270,25122 +_ModuleTable_=271,25139 +export _ModuleTable_;272,25309 rt/changeMPATH/changeMPATH.tdesc,21 local testName 3,16 @@ -14050,7 +14205,7 @@ local testName 3,16 rt/manpath/manpath.tdesc,21 local testName 2,15 -rt/manpath/out.txt,1558 +rt/manpath/out.txt,2160 export LOADEDMODULES;10,286 __LMOD_REF_COUNT_MANPATH=11,308 export __LMOD_REF_COUNT_MANPATH;12,337 @@ -14109,6 +14264,28 @@ export MODULEPATH;89,4119 unset _LMFILES_;90,4138 _ModuleTable_=91,4155 export _ModuleTable_;92,4317 +export LOADEDMODULES;98,4492 +__LMOD_REF_COUNT_MANPATH=99,4514 +export __LMOD_REF_COUNT_MANPATH;100,4598 +MANPATH=101,4631 +export MANPATH;102,4687 +MODULEPATH=103,4703 +export MODULEPATH;104,4745 +_LMFILES_=105,4764 +export _LMFILES_;106,4817 +_ModuleTable_=107,4835 +export _ModuleTable_;108,5158 +export LOADEDMODULES;114,5341 +__LMOD_REF_COUNT_MANPATH=115,5363 +export __LMOD_REF_COUNT_MANPATH;116,5474 +MANPATH=117,5507 +export MANPATH;118,5587 +MODULEPATH=119,5603 +export MODULEPATH;120,5645 +_LMFILES_=121,5664 +export _LMFILES_;122,5759 +_ModuleTable_=123,5777 +export _ModuleTable_;124,6261 rt/perl/perl.tdesc,19 testdescript 3,16 @@ -14129,24 +14306,24 @@ export MODULEPATH;18,658 _LMFILES_=19,677 export _LMFILES_;20,814 _ModuleTable_=21,832 -export _ModuleTable_;22,1489 -export MODULEPATH;28,1722 -_ModuleTable_=29,1741 -export _ModuleTable_;30,2398 -export LMOD_FAMILY_COMPILER;36,2574 -LMOD_FAMILY_COMPILER_VERSION=37,2603 -export LMOD_FAMILY_COMPILER_VERSION;38,2639 -LOADEDMODULES=39,2676 -export LOADEDMODULES;40,2695 -MODULEPATH=41,2717 -export MODULEPATH;42,2802 -_LMFILES_=43,2821 -export _LMFILES_;44,2917 -_ModuleTable_=45,2935 -export _ModuleTable_;46,3450 -export MODULEPATH;52,3683 -_ModuleTable_=53,3702 -export _ModuleTable_;54,4217 +export _ModuleTable_;22,1570 +export MODULEPATH;28,1803 +_ModuleTable_=29,1822 +export _ModuleTable_;30,2560 +export LMOD_FAMILY_COMPILER;36,2736 +LMOD_FAMILY_COMPILER_VERSION=37,2765 +export LMOD_FAMILY_COMPILER_VERSION;38,2801 +LOADEDMODULES=39,2838 +export LOADEDMODULES;40,2857 +MODULEPATH=41,2879 +export MODULEPATH;42,2964 +_LMFILES_=43,2983 +export _LMFILES_;44,3079 +_ModuleTable_=45,3097 +export _ModuleTable_;46,3693 +export MODULEPATH;52,3926 +_ModuleTable_=53,3945 +export _ModuleTable_;54,4541 rt/defaults/defaults.tdesc,21 local testName 2,15 @@ -14389,35 +14566,73 @@ export MODULEPATH;24,961 _LMFILES_=25,980 export _LMFILES_;26,1150 _ModuleTable_=27,1168 -export _ModuleTable_;28,2103 -export MODULEPATH;34,2382 -_ModuleTable_=35,2401 -export _ModuleTable_;36,3336 -export INTEL;42,3501 -LMOD_FAMILY_COMPILERS=43,3515 -export LMOD_FAMILY_COMPILERS;44,3554 -LMOD_FAMILY_COMPILERS_VERSION=45,3584 -export LMOD_FAMILY_COMPILERS_VERSION;46,3622 -LMOD_FAMILY_MPI=47,3660 -export LMOD_FAMILY_MPI;48,3689 -LMOD_FAMILY_MPI_VERSION=49,3713 -export LMOD_FAMILY_MPI_VERSION;50,3744 -MODULEPATH=51,3776 -export MODULEPATH;52,3907 -_ModuleTable_=53,3926 -export _ModuleTable_;54,4861 -__LMOD_DEFAULT_MODULES_LOADED__=55,4883 -export __LMOD_DEFAULT_MODULES_LOADED__;56,4918 -export MODULEPATH;62,5215 -_ModuleTable_=63,5234 -export _ModuleTable_;64,6169 -export MODULEPATH;70,6449 -_ModuleTable_=71,6468 -export _ModuleTable_;72,7403 +export _ModuleTable_;28,2284 +export MODULEPATH;34,2563 +_ModuleTable_=35,2582 +export _ModuleTable_;36,3698 +export INTEL;42,3863 +LMOD_FAMILY_COMPILERS=43,3877 +export LMOD_FAMILY_COMPILERS;44,3916 +LMOD_FAMILY_COMPILERS_VERSION=45,3946 +export LMOD_FAMILY_COMPILERS_VERSION;46,3984 +LMOD_FAMILY_MPI=47,4022 +export LMOD_FAMILY_MPI;48,4051 +LMOD_FAMILY_MPI_VERSION=49,4075 +export LMOD_FAMILY_MPI_VERSION;50,4106 +MODULEPATH=51,4138 +export MODULEPATH;52,4269 +_ModuleTable_=53,4288 +export _ModuleTable_;54,5404 +__LMOD_DEFAULT_MODULES_LOADED__=55,5426 +export __LMOD_DEFAULT_MODULES_LOADED__;56,5461 +export MODULEPATH;62,5758 +_ModuleTable_=63,5777 +export _ModuleTable_;64,6893 +export MODULEPATH;70,7173 +_ModuleTable_=71,7192 +export _ModuleTable_;72,8308 rt/mixed/mixed.tdesc,21 local testName=2,15 +rt/mpathColl/out.txt,869 +export LOADEDMODULES;10,302 +__LMOD_REF_COUNT_MODULEPATH=11,324 +export __LMOD_REF_COUNT_MODULEPATH;12,441 +MODULEPATH=13,477 +export MODULEPATH;14,569 +_LMFILES_=15,588 +export _LMFILES_;16,674 +_ModuleTable_=17,692 +export _ModuleTable_;18,1371 +__LMOD_REF_COUNT_MODULEPATH=36,1875 +export __LMOD_REF_COUNT_MODULEPATH;37,1924 +MODULEPATH=38,1960 +export MODULEPATH;39,1990 +unset _LMFILES_;40,2009 +_ModuleTable_=41,2026 +export _ModuleTable_;42,2337 +export MODULEPATH;48,2519 +_ModuleTable_=49,2538 +export _ModuleTable_;50,2676 +export LOADEDMODULES;60,2979 +MODULEPATH=61,3001 +export MODULEPATH;62,3031 +_LMFILES_=63,3050 +export _LMFILES_;64,3092 +_ModuleTable_=65,3110 +export _ModuleTable_;66,3401 +junk=67,3423 +export junk;68,3434 +MODULEPATH=78,3696 +export MODULEPATH;79,3726 +unset _LMFILES_;80,3745 +_ModuleTable_=81,3762 +export _ModuleTable_;82,3900 + +rt/mpathColl/mpathColl.tdesc,21 +local testName 2,15 + rt/rstats/out.txt,707 export LOADEDMODULES;10,306 __LMOD_REF_COUNT_MODULEPATH=11,328 @@ -14588,6 +14803,195 @@ export _LMFILES_;228,21054 _ModuleTable_=229,21072 export _ModuleTable_;230,21850 +rt/restore_reset/out.txt,5384 +export LOADEDMODULES;10,287 +__LMOD_REF_COUNT_MANPATH=11,309 +export __LMOD_REF_COUNT_MANPATH;12,387 +MANPATH=13,420 +export MANPATH;14,479 +__LMOD_REF_COUNT_MODULEPATH=15,495 +export __LMOD_REF_COUNT_MODULEPATH;16,562 +MODULEPATH=17,598 +export MODULEPATH;18,646 +__LMOD_REF_COUNT_PATH=19,665 +export __LMOD_REF_COUNT_PATH;20,772 +PATH=21,802 +export PATH;22,884 +_LMFILES_=23,897 +export _LMFILES_;24,959 +_ModuleTable_=25,977 +export _ModuleTable_;26,1344 +export MODULEPATH;32,1540 +_ModuleTable_=33,1559 +export _ModuleTable_;34,1926 +unset __LMOD_REF_COUNT_MANPATH;40,2096 +unset MANPATH;41,2128 +MODULEPATH=42,2143 +export MODULEPATH;43,2191 +__LMOD_REF_COUNT_PATH=44,2210 +export __LMOD_REF_COUNT_PATH;45,2270 +PATH=46,2300 +export PATH;47,2338 +unset _LMFILES_;48,2351 +_ModuleTable_=49,2368 +export _ModuleTable_;50,2542 +export CC;56,2746 +CXX=57,2757 +export CXX;58,2810 +F90=59,2822 +export F90;60,2880 +FC=61,2892 +export FC;62,2949 +__LMOD_REF_COUNT_INCLUDE=63,2960 +export __LMOD_REF_COUNT_INCLUDE;64,3098 +INCLUDE=65,3131 +export INCLUDE;66,3247 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=67,3263 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;68,3345 +LD_LIBRARY_PATH=69,3386 +export LD_LIBRARY_PATH;70,3449 +__LMOD_REF_COUNT_LIBRARY_PATH=71,3473 +export __LMOD_REF_COUNT_LIBRARY_PATH;72,3552 +LIBRARY_PATH=73,3590 +export LIBRARY_PATH;74,3650 +LMOD_FAMILY_COMPILER=75,3671 +export LMOD_FAMILY_COMPILER;76,3697 +LMOD_FAMILY_COMPILER_VERSION=77,3726 +export LMOD_FAMILY_COMPILER_VERSION;78,3763 +LOADEDMODULES=79,3800 +export LOADEDMODULES;80,3826 +__LMOD_REF_COUNT_MANPATH=81,3848 +export __LMOD_REF_COUNT_MANPATH;82,3926 +MANPATH=83,3959 +export MANPATH;84,4018 +__LMOD_REF_COUNT_MODULEPATH=85,4034 +export __LMOD_REF_COUNT_MODULEPATH;86,4162 +MODULEPATH=87,4198 +export MODULEPATH;88,4304 +__LMOD_REF_COUNT_PATH=89,4323 +export __LMOD_REF_COUNT_PATH;90,4430 +PATH=91,4460 +export PATH;92,4542 +_LMFILES_=93,4555 +export _LMFILES_;94,4617 +_ModuleTable_=95,4635 +export _ModuleTable_;96,5171 +unset CXX;102,5332 +unset F90;103,5343 +unset FC;104,5354 +unset __LMOD_REF_COUNT_INCLUDE;105,5364 +unset INCLUDE;106,5396 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;107,5411 +unset LD_LIBRARY_PATH;108,5451 +unset __LMOD_REF_COUNT_LIBRARY_PATH;109,5474 +unset LIBRARY_PATH;110,5511 +unset LMOD_FAMILY_COMPILER;111,5531 +unset LMOD_FAMILY_COMPILER_VERSION;112,5559 +LOADEDMODULES=113,5595 +export LOADEDMODULES;114,5621 +__LMOD_REF_COUNT_MANPATH=115,5643 +export __LMOD_REF_COUNT_MANPATH;116,5721 +MANPATH=117,5754 +export MANPATH;118,5813 +__LMOD_REF_COUNT_MODULEPATH=119,5829 +export __LMOD_REF_COUNT_MODULEPATH;120,5896 +MODULEPATH=121,5932 +export MODULEPATH;122,5980 +__LMOD_REF_COUNT_PATH=123,5999 +export __LMOD_REF_COUNT_PATH;124,6106 +PATH=125,6136 +export PATH;126,6218 +_LMFILES_=127,6231 +export _LMFILES_;128,6293 +_ModuleTable_=129,6311 +export _ModuleTable_;130,6678 +__LMOD_DEFAULT_MODULES_LOADED__=131,6700 +export __LMOD_DEFAULT_MODULES_LOADED__;132,6735 +unset __LMOD_REF_COUNT_MANPATH;138,6923 +unset MANPATH;139,6955 +MODULEPATH=140,6970 +export MODULEPATH;141,7018 +__LMOD_REF_COUNT_PATH=142,7037 +export __LMOD_REF_COUNT_PATH;143,7097 +PATH=144,7127 +export PATH;145,7165 +unset _LMFILES_;146,7178 +_ModuleTable_=147,7195 +export _ModuleTable_;148,7369 +export CC;154,7573 +CXX=155,7584 +export CXX;156,7637 +F90=157,7649 +export F90;158,7707 +FC=159,7719 +export FC;160,7776 +__LMOD_REF_COUNT_INCLUDE=161,7787 +export __LMOD_REF_COUNT_INCLUDE;162,7925 +INCLUDE=163,7958 +export INCLUDE;164,8074 +__LMOD_REF_COUNT_LD_LIBRARY_PATH=165,8090 +export __LMOD_REF_COUNT_LD_LIBRARY_PATH;166,8172 +LD_LIBRARY_PATH=167,8213 +export LD_LIBRARY_PATH;168,8276 +__LMOD_REF_COUNT_LIBRARY_PATH=169,8300 +export __LMOD_REF_COUNT_LIBRARY_PATH;170,8379 +LIBRARY_PATH=171,8417 +export LIBRARY_PATH;172,8477 +LMOD_FAMILY_COMPILER=173,8498 +export LMOD_FAMILY_COMPILER;174,8524 +LMOD_FAMILY_COMPILER_VERSION=175,8553 +export LMOD_FAMILY_COMPILER_VERSION;176,8590 +LOADEDMODULES=177,8627 +export LOADEDMODULES;178,8653 +__LMOD_REF_COUNT_MANPATH=179,8675 +export __LMOD_REF_COUNT_MANPATH;180,8753 +MANPATH=181,8786 +export MANPATH;182,8845 +__LMOD_REF_COUNT_MODULEPATH=183,8861 +export __LMOD_REF_COUNT_MODULEPATH;184,8989 +MODULEPATH=185,9025 +export MODULEPATH;186,9131 +__LMOD_REF_COUNT_PATH=187,9150 +export __LMOD_REF_COUNT_PATH;188,9257 +PATH=189,9287 +export PATH;190,9369 +_LMFILES_=191,9382 +export _LMFILES_;192,9444 +_ModuleTable_=193,9462 +export _ModuleTable_;194,9998 +unset CXX;200,10157 +unset F90;201,10168 +unset FC;202,10179 +unset __LMOD_REF_COUNT_INCLUDE;203,10189 +unset INCLUDE;204,10221 +unset __LMOD_REF_COUNT_LD_LIBRARY_PATH;205,10236 +unset LD_LIBRARY_PATH;206,10276 +unset __LMOD_REF_COUNT_LIBRARY_PATH;207,10299 +unset LIBRARY_PATH;208,10336 +unset LMOD_FAMILY_COMPILER;209,10356 +unset LMOD_FAMILY_COMPILER_VERSION;210,10384 +LOADEDMODULES=211,10420 +export LOADEDMODULES;212,10446 +__LMOD_REF_COUNT_MANPATH=213,10468 +export __LMOD_REF_COUNT_MANPATH;214,10546 +MANPATH=215,10579 +export MANPATH;216,10638 +__LMOD_REF_COUNT_MODULEPATH=217,10654 +export __LMOD_REF_COUNT_MODULEPATH;218,10721 +MODULEPATH=219,10757 +export MODULEPATH;220,10805 +__LMOD_REF_COUNT_PATH=221,10824 +export __LMOD_REF_COUNT_PATH;222,10931 +PATH=223,10961 +export PATH;224,11043 +_LMFILES_=225,11056 +export _LMFILES_;226,11118 +_ModuleTable_=227,11136 +export _ModuleTable_;228,11503 + +rt/restore_reset/restore_reset.tdesc,21 +local testName 2,15 + rt/funny_files/out.txt,139 export __LMOD_REF_COUNT_MODULEPATH;10,318 MODULEPATH=11,354 @@ -14651,16 +15055,16 @@ export PATH;58,4966 _LMFILES_=59,4979 export _LMFILES_;60,5093 _ModuleTable_=61,5111 -export _ModuleTable_;62,5782 -export MODULEPATH;68,6065 -_ModuleTable_=69,6084 -export _ModuleTable_;70,6755 -export MODULEPATH;76,7039 -_ModuleTable_=77,7058 -export _ModuleTable_;78,7729 -export MODULEPATH;84,8017 -_ModuleTable_=85,8036 -export _ModuleTable_;86,8707 +export _ModuleTable_;62,5968 +export MODULEPATH;68,6251 +_ModuleTable_=69,6270 +export _ModuleTable_;70,7127 +export MODULEPATH;76,7411 +_ModuleTable_=77,7430 +export _ModuleTable_;78,8287 +export MODULEPATH;84,8575 +_ModuleTable_=85,8594 +export _ModuleTable_;86,9451 rt/petsc/petsc.tdesc,21 local testName 2,15 @@ -14710,32 +15114,32 @@ export MODULEPATH;24,1253 _LMFILES_=25,1272 export _LMFILES_;26,1330 _ModuleTable_=27,1348 -export _ModuleTable_;28,1815 -export LOADEDMODULES;34,2003 -MODULEPATH=35,2025 -export MODULEPATH;36,2153 -_LMFILES_=37,2172 -export _LMFILES_;38,2292 -_ModuleTable_=39,2310 -export _ModuleTable_;40,2975 -boost=41,2997 -export boost;42,3009 -export LOADEDMODULES;48,3201 -__LMOD_REF_COUNT_MODULEPATH=49,3223 -export __LMOD_REF_COUNT_MODULEPATH;50,3376 -MODULEPATH=51,3412 -export MODULEPATH;52,3540 -_LMFILES_=53,3559 -export _LMFILES_;54,3728 -_ModuleTable_=55,3746 -export _ModuleTable_;56,4588 -__LMOD_STACK_MODULEPATH=57,4610 -export __LMOD_STACK_MODULEPATH;58,4867 -boost=59,4899 -export boost;60,4911 -export MODULEPATH;66,5179 -_ModuleTable_=67,5198 -export _ModuleTable_;68,6040 +export _ModuleTable_;28,1908 +export LOADEDMODULES;34,2096 +MODULEPATH=35,2118 +export MODULEPATH;36,2246 +_LMFILES_=37,2265 +export _LMFILES_;38,2385 +_ModuleTable_=39,2403 +export _ModuleTable_;40,3161 +boost=41,3183 +export boost;42,3195 +export LOADEDMODULES;48,3387 +__LMOD_REF_COUNT_MODULEPATH=49,3409 +export __LMOD_REF_COUNT_MODULEPATH;50,3562 +MODULEPATH=51,3598 +export MODULEPATH;52,3726 +_LMFILES_=53,3745 +export _LMFILES_;54,3914 +_ModuleTable_=55,3932 +export _ModuleTable_;56,5023 +__LMOD_STACK_MODULEPATH=57,5045 +export __LMOD_STACK_MODULEPATH;58,5302 +boost=59,5334 +export boost;60,5346 +export MODULEPATH;66,5614 +_ModuleTable_=67,5633 +export _ModuleTable_;68,6724 rt/arch_swap/arch_swap.tdesc,21 local testName 2,15 @@ -15136,7 +15540,7 @@ export _ModuleTable_;487,38982 rt/csh_swap/csh_swap.tdesc,19 testdescript 2,15 -rt/csh_swap/out.txt,14887 +rt/csh_swap/out.txt,14888 setenv BAR ab\?c;c8,156 setenv BAZ ab-c;c9,174 setenv FOO aa,10,191 @@ -15185,61 +15589,61 @@ setenv PAT_REPORT_PRUNE_NAME _cray\$mt_start_,__cray_hwpc_,f_cray_hwpc_,cstart,_ setenv PAT_REPORT_PRUNE_NAME _cray\$mt_start_,__cray_hwpc_,f_cray_hwpc_,cstart,__pat_,pat_region_,PAT_,OMP.slave_loop,slave_entry,_new_slave_entry,THREAD_POOL_join,__libc_start_main,_start,__start,start_thread,__wrap_,UPC_ADIO_,_upc_,upc_,__caf_,__pgas_,syscall,__device_stub;30,2614 setenv TACC_PMETIS_DOC /vol/pkg/Parmetis/intel/10.1/parmetis/3.1/Manual;Manual33,3023 setenv _LMFILES_ ProjectDIR/rt/csh_swap/mf/Core/admin/admin-1.0.lua:ProjectDIR/rt/csh_swap/mf/Core/dollar/1.0:ProjectDIR/rt/csh_swap/mf/Core/unix/unix.lua:ProjectDIR/rt/csh_swap/mf/Core/local/1.3.lua:ProjectDIR/rt/csh_swap/mf/Core/intel/intel.lua:ProjectDIR/rt/csh_swap/mf/Core/noweb/2.10c.lua:ProjectDIR/rt/csh_swap/mf/Core/PrgEnv.lua:ProjectDIR/rt/csh_swap/mf/Compiler/intel/10.1/openmpi/1.2.6.lua:ProjectDIR/rt/csh_swap/mf/MPI/intel/10.1/openmpi/1.2.6/parmetis/3.1.lua;lua36,3228 -unsetenv LD_LIBRARY_PATH;42,5859 -unsetenv LMOD_FAMILY_COMPILER;43,5885 -unsetenv LMOD_FAMILY_COMPILER_VERSION;44,5916 -unsetenv LMOD_FAMILY_MPI;45,5955 -unsetenv LMOD_FAMILY_MPI_VERSION;46,5981 -setenv __LMOD_REF_COUNT_MANPATH /vol/local/noweb/noweb/man:1\;/usr/share/man:man48,6116 -setenv MANPATH /vol/local/noweb/noweb/man:/usr/share/man;man49,6196 -unsetenv MKL_DIR;50,6254 -unsetenv MKL_INCLUDE;51,6272 -setenv __LMOD_REF_COUNT_MODULEPATH ProjectDIR/rt/csh_swap/mf/Core:1\;ProjectDIR/rt/csh_swap/mf/Core2:Core252,6294 -setenv MODULEPATH ProjectDIR/rt/csh_swap/mf/Core:ProjectDIR/rt/csh_swap/mf/Core2;Core253,6398 -unsetenv MPIHOME;54,6480 -setenv __LMOD_REF_COUNT_PATH /vol/local/noweb/icon/bin:1\;/vol/local/noweb/2.10c/bin:1\;/usr/sbin:1\;/sbin:1\;ProjectDIR/proj_mgmt:1\;PATH_to_TM:PATH_to_TM55,6498 -setenv PATH /vol/local/noweb/icon/bin:/vol/local/noweb/2.10c/bin:/usr/sbin:/sbin:ProjectDIR/proj_mgmt:PATH_to_TM;PATH_to_TM56,6646 -setenv TACC_PMETIS_DOC /vol/pkg/Parmetis/parmetis/3.1/Manual;Manual59,6870 -setenv _LMFILES_ ProjectDIR/rt/csh_swap/mf/Core/admin/admin-1.0.lua:ProjectDIR/rt/csh_swap/mf/Core/dollar/1.0:ProjectDIR/rt/csh_swap/mf/Core/unix/unix.lua:ProjectDIR/rt/csh_swap/mf/Core/local/1.3.lua:ProjectDIR/rt/csh_swap/mf/Core/noweb/2.10c.lua:ProjectDIR/rt/csh_swap/mf/Core/PrgEnv.lua:ProjectDIR/rt/csh_swap/mf/Core/parmetis/3.1.lua;lua62,7042 -setenv LD_LIBRARY_PATH /vol/local/mpi/gcc/4.2.3/openmpi/1.2.6.opt/lib;lib68,9257 -setenv LMOD_FAMILY_COMPILER gcc;69,9328 -setenv LMOD_FAMILY_MPI openmpi;71,9404 -setenv __LMOD_REF_COUNT_MANPATH /vol/local/mpi/gcc/4.2.3/openmpi/1.2.6.opt/man:1\;/vol/local/noweb/noweb/man:1\;/usr/share/man:man74,9599 -setenv MANPATH /vol/local/mpi/gcc/4.2.3/openmpi/1.2.6.opt/man:/vol/local/noweb/noweb/man:/usr/share/man;man75,9729 -setenv __LMOD_REF_COUNT_MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6:1\;ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3:1\;ProjectDIR/rt/csh_swap/mf/Core:1\;ProjectDIR/rt/csh_swap/mf/Core2:Core276,9834 -setenv MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6:ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3:ProjectDIR/rt/csh_swap/mf/Core:ProjectDIR/rt/csh_swap/mf/Core2;Core277,10043 -setenv MPIHOME /vol/local/mpi/gcc/4.2.3/openmpi/1.2.6.opt;opt78,10224 -setenv __LMOD_REF_COUNT_PATH /vol/local/mpi/gcc/4.2.3/openmpi/1.2.6.opt/bin:1\;/vol/local/noweb/icon/bin:1\;/vol/local/noweb/2.10c/bin:1\;/usr/sbin:1\;/sbin:1\;ProjectDIR/proj_mgmt:1\;PATH_to_TM:PATH_to_TM79,10283 -setenv PATH /vol/local/mpi/gcc/4.2.3/openmpi/1.2.6.opt/bin:/vol/local/noweb/icon/bin:/vol/local/noweb/2.10c/bin:/usr/sbin:/sbin:ProjectDIR/proj_mgmt:PATH_to_TM;PATH_to_TM80,10481 -setenv TACC_PMETIS_DOC /vol/pkg/Parmetis/gcc/4.2.3/parmetis/3.1/Manual;Manual83,10772 -setenv _LMFILES_ ProjectDIR/rt/csh_swap/mf/Core/admin/admin-1.0.lua:ProjectDIR/rt/csh_swap/mf/Core/dollar/1.0:ProjectDIR/rt/csh_swap/mf/Core/unix/unix.lua:ProjectDIR/rt/csh_swap/mf/Core/local/1.3.lua:ProjectDIR/rt/csh_swap/mf/Core/noweb/2.10c.lua:ProjectDIR/rt/csh_swap/mf/Core/PrgEnv.lua:ProjectDIR/rt/csh_swap/mf/Core/gcc/4.2.3.lua:ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3/openmpi/1.2.6.lua:ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6/parmetis/3.1.lua;lua86,10974 -setenv MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6:ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3:ProjectDIR/rt/csh_swap/mf/Core:ProjectDIR/rt/csh_swap/mf/Core2;Core293,13732 -setenv NAME minfo;94,13913 -setenv USER_SHELL csh;95,13932 -setenv MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6:ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3:ProjectDIR/rt/csh_swap/mf/Core:ProjectDIR/rt/csh_swap/mf/Core2;Core2104,17148 -unsetenv NAME;105,17329 -unsetenv USER_SHELL;106,17344 -setenv _LMFILES_ ProjectDIR/rt/csh_swap/mf/Core/admin/admin-1.0.lua:ProjectDIR/rt/csh_swap/mf/Core/dollar/1.0:ProjectDIR/rt/csh_swap/mf/Core/unix/unix.lua:ProjectDIR/rt/csh_swap/mf/Core/local/1.3.lua:ProjectDIR/rt/csh_swap/mf/Core/noweb/2.10c.lua:ProjectDIR/rt/csh_swap/mf/Core/PrgEnv.lua:ProjectDIR/rt/csh_swap/mf/Core/gcc/4.2.3.lua:ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3/openmpi/1.2.6.lua:ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6/parmetis/3.1.lua:ProjectDIR/rt/csh_swap/mf/Core2/ml/1.0.lua;lua107,17365 -setenv MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6:ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3:ProjectDIR/rt/csh_swap/mf/Core:ProjectDIR/rt/csh_swap/mf/Core2;Core2114,20326 -setenv USER_SHELL csh;116,20530 -setenv MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6:ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3:ProjectDIR/rt/csh_swap/mf/Core:ProjectDIR/rt/csh_swap/mf/Core2;Core2123,23718 -setenv MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6:ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3:ProjectDIR/rt/csh_swap/mf/Core:ProjectDIR/rt/csh_swap/mf/Core2;Core2131,27298 -uncomplete foo;134,30426 -setenv LD_LIBRARY_PATH /vol/local/mpi/intel/10.1/openmpi/1.2.6.opt/lib:/vol/local/intel/mkl/mkl/lib/lib:/vol/local/intel/idb/idb/lib:/vol/local/intel/fc/fc/lib:/vol/local/intel/cc/cc/lib;lib139,30724 -setenv LMOD_FAMILY_COMPILER intel;140,30912 -setenv LMOD_FAMILY_COMPILER_VERSION intel;141,30947 -setenv LMOD_FAMILY_MPI openmpi;142,30990 -setenv __LMOD_REF_COUNT_MANPATH /vol/local/mpi/intel/10.1/openmpi/1.2.6.opt/man:1\;/vol/local/intel/mkl/mkl/man:1\;/vol/local/intel/idb/idb/man:1\;/vol/local/intel/fc/fc/man:1\;/vol/local/intel/cc/cc/man:1\;/vol/local/noweb/noweb/man:1\;/usr/share/man:man145,31204 -setenv MANPATH /vol/local/mpi/intel/10.1/openmpi/1.2.6.opt/man:/vol/local/intel/mkl/mkl/man:/vol/local/intel/idb/idb/man:/vol/local/intel/fc/fc/man:/vol/local/intel/cc/cc/man:/vol/local/noweb/noweb/man:/usr/share/man;man146,31459 -setenv MKL_DIR /vol/local/intel/mkl/mkl/lib/lib;lib147,31677 -setenv MKL_INCLUDE /vol/local/intel/mkl/mkl/include;include148,31726 -setenv __LMOD_REF_COUNT_MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/intel/10.1/openmpi/1.2.6:1\;ProjectDIR/rt/csh_swap/mf/Compiler/intel/10.1:1\;ProjectDIR/rt/csh_swap/mf/Core:1\;ProjectDIR/rt/csh_swap/mf/Core2:Core2149,31779 -setenv MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/intel/10.1/openmpi/1.2.6:ProjectDIR/rt/csh_swap/mf/Compiler/intel/10.1:ProjectDIR/rt/csh_swap/mf/Core:ProjectDIR/rt/csh_swap/mf/Core2;Core2150,31990 -setenv MPIHOME /vol/local/mpi/intel/10.1/openmpi/1.2.6.opt;opt151,32173 -setenv __LMOD_REF_COUNT_PATH /vol/local/mpi/intel/10.1/openmpi/1.2.6.opt/bin:1\;/vol/local/intel/idb/idb/bin:1\;/vol/local/intel/fc/fc/bin:1\;/vol/local/intel/cc/cc/bin:1\;/vol/local/noweb/icon/bin:1\;/vol/local/noweb/2.10c/bin:1\;/usr/sbin:1\;/sbin:1\;ProjectDIR/proj_mgmt:1\;PATH_to_TM:PATH_to_TM152,32233 -setenv PATH /vol/local/mpi/intel/10.1/openmpi/1.2.6.opt/bin:/vol/local/intel/idb/idb/bin:/vol/local/intel/fc/fc/bin:/vol/local/intel/cc/cc/bin:/vol/local/noweb/icon/bin:/vol/local/noweb/2.10c/bin:/usr/sbin:/sbin:ProjectDIR/proj_mgmt:PATH_to_TM;PATH_to_TM153,32524 -setenv TACC_PMETIS_DOC /vol/pkg/Parmetis/intel/10.1/parmetis/3.1/Manual;Manual156,32901 -setenv _LMFILES_ ProjectDIR/rt/csh_swap/mf/Core/admin/admin-1.0.lua:ProjectDIR/rt/csh_swap/mf/Core/dollar/1.0:ProjectDIR/rt/csh_swap/mf/Core/unix/unix.lua:ProjectDIR/rt/csh_swap/mf/Core/local/1.3.lua:ProjectDIR/rt/csh_swap/mf/Core/noweb/2.10c.lua:ProjectDIR/rt/csh_swap/mf/Core/PrgEnv.lua:ProjectDIR/rt/csh_swap/mf/Core2/ml/1.0.lua:ProjectDIR/rt/csh_swap/mf/Core2/minfo/1.0:ProjectDIR/rt/csh_swap/mf/Core/intel/intel.lua:ProjectDIR/rt/csh_swap/mf/Compiler/intel/10.1/openmpi/1.2.6.lua:ProjectDIR/rt/csh_swap/mf/MPI/intel/10.1/openmpi/1.2.6/parmetis/3.1.lua;lua159,33106 +unsetenv LD_LIBRARY_PATH;42,6052 +unsetenv LMOD_FAMILY_COMPILER;43,6078 +unsetenv LMOD_FAMILY_COMPILER_VERSION;44,6109 +unsetenv LMOD_FAMILY_MPI;45,6148 +unsetenv LMOD_FAMILY_MPI_VERSION;46,6174 +setenv __LMOD_REF_COUNT_MANPATH /vol/local/noweb/noweb/man:1\;/usr/share/man:man48,6309 +setenv MANPATH /vol/local/noweb/noweb/man:/usr/share/man;man49,6389 +unsetenv MKL_DIR;50,6447 +unsetenv MKL_INCLUDE;51,6465 +setenv __LMOD_REF_COUNT_MODULEPATH ProjectDIR/rt/csh_swap/mf/Core:1\;ProjectDIR/rt/csh_swap/mf/Core2:Core252,6487 +setenv MODULEPATH ProjectDIR/rt/csh_swap/mf/Core:ProjectDIR/rt/csh_swap/mf/Core2;Core253,6591 +unsetenv MPIHOME;54,6673 +setenv __LMOD_REF_COUNT_PATH /vol/local/noweb/icon/bin:1\;/vol/local/noweb/2.10c/bin:1\;/usr/sbin:1\;/sbin:1\;ProjectDIR/proj_mgmt:1\;PATH_to_TM:PATH_to_TM55,6691 +setenv PATH /vol/local/noweb/icon/bin:/vol/local/noweb/2.10c/bin:/usr/sbin:/sbin:ProjectDIR/proj_mgmt:PATH_to_TM;PATH_to_TM56,6839 +setenv TACC_PMETIS_DOC /vol/pkg/Parmetis/parmetis/3.1/Manual;Manual59,7063 +setenv _LMFILES_ ProjectDIR/rt/csh_swap/mf/Core/admin/admin-1.0.lua:ProjectDIR/rt/csh_swap/mf/Core/dollar/1.0:ProjectDIR/rt/csh_swap/mf/Core/unix/unix.lua:ProjectDIR/rt/csh_swap/mf/Core/local/1.3.lua:ProjectDIR/rt/csh_swap/mf/Core/noweb/2.10c.lua:ProjectDIR/rt/csh_swap/mf/Core/PrgEnv.lua:ProjectDIR/rt/csh_swap/mf/Core/parmetis/3.1.lua;lua62,7235 +setenv LD_LIBRARY_PATH /vol/local/mpi/gcc/4.2.3/openmpi/1.2.6.opt/lib;lib68,9450 +setenv LMOD_FAMILY_COMPILER gcc;69,9521 +setenv LMOD_FAMILY_MPI openmpi;71,9597 +setenv __LMOD_REF_COUNT_MANPATH /vol/local/mpi/gcc/4.2.3/openmpi/1.2.6.opt/man:1\;/vol/local/noweb/noweb/man:1\;/usr/share/man:man74,9792 +setenv MANPATH /vol/local/mpi/gcc/4.2.3/openmpi/1.2.6.opt/man:/vol/local/noweb/noweb/man:/usr/share/man;man75,9922 +setenv __LMOD_REF_COUNT_MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6:1\;ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3:1\;ProjectDIR/rt/csh_swap/mf/Core:1\;ProjectDIR/rt/csh_swap/mf/Core2:Core276,10027 +setenv MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6:ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3:ProjectDIR/rt/csh_swap/mf/Core:ProjectDIR/rt/csh_swap/mf/Core2;Core277,10236 +setenv MPIHOME /vol/local/mpi/gcc/4.2.3/openmpi/1.2.6.opt;opt78,10417 +setenv __LMOD_REF_COUNT_PATH /vol/local/mpi/gcc/4.2.3/openmpi/1.2.6.opt/bin:1\;/vol/local/noweb/icon/bin:1\;/vol/local/noweb/2.10c/bin:1\;/usr/sbin:1\;/sbin:1\;ProjectDIR/proj_mgmt:1\;PATH_to_TM:PATH_to_TM79,10476 +setenv PATH /vol/local/mpi/gcc/4.2.3/openmpi/1.2.6.opt/bin:/vol/local/noweb/icon/bin:/vol/local/noweb/2.10c/bin:/usr/sbin:/sbin:ProjectDIR/proj_mgmt:PATH_to_TM;PATH_to_TM80,10674 +setenv TACC_PMETIS_DOC /vol/pkg/Parmetis/gcc/4.2.3/parmetis/3.1/Manual;Manual83,10965 +setenv _LMFILES_ ProjectDIR/rt/csh_swap/mf/Core/admin/admin-1.0.lua:ProjectDIR/rt/csh_swap/mf/Core/dollar/1.0:ProjectDIR/rt/csh_swap/mf/Core/unix/unix.lua:ProjectDIR/rt/csh_swap/mf/Core/local/1.3.lua:ProjectDIR/rt/csh_swap/mf/Core/noweb/2.10c.lua:ProjectDIR/rt/csh_swap/mf/Core/PrgEnv.lua:ProjectDIR/rt/csh_swap/mf/Core/gcc/4.2.3.lua:ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3/openmpi/1.2.6.lua:ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6/parmetis/3.1.lua;lua86,11167 +setenv MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6:ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3:ProjectDIR/rt/csh_swap/mf/Core:ProjectDIR/rt/csh_swap/mf/Core2;Core293,14116 +setenv NAME minfo;94,14297 +setenv USER_SHELL csh;95,14316 +setenv MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6:ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3:ProjectDIR/rt/csh_swap/mf/Core:ProjectDIR/rt/csh_swap/mf/Core2;Core2104,17723 +unsetenv NAME;105,17904 +unsetenv USER_SHELL;106,17919 +setenv _LMFILES_ ProjectDIR/rt/csh_swap/mf/Core/admin/admin-1.0.lua:ProjectDIR/rt/csh_swap/mf/Core/dollar/1.0:ProjectDIR/rt/csh_swap/mf/Core/unix/unix.lua:ProjectDIR/rt/csh_swap/mf/Core/local/1.3.lua:ProjectDIR/rt/csh_swap/mf/Core/noweb/2.10c.lua:ProjectDIR/rt/csh_swap/mf/Core/PrgEnv.lua:ProjectDIR/rt/csh_swap/mf/Core/gcc/4.2.3.lua:ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3/openmpi/1.2.6.lua:ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6/parmetis/3.1.lua:ProjectDIR/rt/csh_swap/mf/Core2/ml/1.0.lua;lua107,17940 +setenv MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6:ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3:ProjectDIR/rt/csh_swap/mf/Core:ProjectDIR/rt/csh_swap/mf/Core2;Core2114,21092 +setenv USER_SHELL csh;116,21296 +setenv MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6:ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3:ProjectDIR/rt/csh_swap/mf/Core:ProjectDIR/rt/csh_swap/mf/Core2;Core2123,24675 +setenv MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/gcc/4.2.3/openmpi/1.2.6:ProjectDIR/rt/csh_swap/mf/Compiler/gcc/4.2.3:ProjectDIR/rt/csh_swap/mf/Core:ProjectDIR/rt/csh_swap/mf/Core2;Core2131,28446 +uncomplete foo;134,31765 +setenv LD_LIBRARY_PATH /vol/local/mpi/intel/10.1/openmpi/1.2.6.opt/lib:/vol/local/intel/mkl/mkl/lib/lib:/vol/local/intel/idb/idb/lib:/vol/local/intel/fc/fc/lib:/vol/local/intel/cc/cc/lib;lib139,32063 +setenv LMOD_FAMILY_COMPILER intel;140,32251 +setenv LMOD_FAMILY_COMPILER_VERSION intel;141,32286 +setenv LMOD_FAMILY_MPI openmpi;142,32329 +setenv __LMOD_REF_COUNT_MANPATH /vol/local/mpi/intel/10.1/openmpi/1.2.6.opt/man:1\;/vol/local/intel/mkl/mkl/man:1\;/vol/local/intel/idb/idb/man:1\;/vol/local/intel/fc/fc/man:1\;/vol/local/intel/cc/cc/man:1\;/vol/local/noweb/noweb/man:1\;/usr/share/man:man145,32543 +setenv MANPATH /vol/local/mpi/intel/10.1/openmpi/1.2.6.opt/man:/vol/local/intel/mkl/mkl/man:/vol/local/intel/idb/idb/man:/vol/local/intel/fc/fc/man:/vol/local/intel/cc/cc/man:/vol/local/noweb/noweb/man:/usr/share/man;man146,32798 +setenv MKL_DIR /vol/local/intel/mkl/mkl/lib/lib;lib147,33016 +setenv MKL_INCLUDE /vol/local/intel/mkl/mkl/include;include148,33065 +setenv __LMOD_REF_COUNT_MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/intel/10.1/openmpi/1.2.6:1\;ProjectDIR/rt/csh_swap/mf/Compiler/intel/10.1:1\;ProjectDIR/rt/csh_swap/mf/Core:1\;ProjectDIR/rt/csh_swap/mf/Core2:Core2149,33118 +setenv MODULEPATH ProjectDIR/rt/csh_swap/mf/MPI/intel/10.1/openmpi/1.2.6:ProjectDIR/rt/csh_swap/mf/Compiler/intel/10.1:ProjectDIR/rt/csh_swap/mf/Core:ProjectDIR/rt/csh_swap/mf/Core2;Core2150,33329 +setenv MPIHOME /vol/local/mpi/intel/10.1/openmpi/1.2.6.opt;opt151,33512 +setenv __LMOD_REF_COUNT_PATH /vol/local/mpi/intel/10.1/openmpi/1.2.6.opt/bin:1\;/vol/local/intel/idb/idb/bin:1\;/vol/local/intel/fc/fc/bin:1\;/vol/local/intel/cc/cc/bin:1\;/vol/local/noweb/icon/bin:1\;/vol/local/noweb/2.10c/bin:1\;/usr/sbin:1\;/sbin:1\;ProjectDIR/proj_mgmt:1\;PATH_to_TM:PATH_to_TM152,33572 +setenv PATH /vol/local/mpi/intel/10.1/openmpi/1.2.6.opt/bin:/vol/local/intel/idb/idb/bin:/vol/local/intel/fc/fc/bin:/vol/local/intel/cc/cc/bin:/vol/local/noweb/icon/bin:/vol/local/noweb/2.10c/bin:/usr/sbin:/sbin:ProjectDIR/proj_mgmt:PATH_to_TM;PATH_to_TM153,33863 +setenv TACC_PMETIS_DOC /vol/pkg/Parmetis/intel/10.1/parmetis/3.1/Manual;Manual156,34240 +setenv _LMFILES_ ProjectDIR/rt/csh_swap/mf/Core/admin/admin-1.0.lua:ProjectDIR/rt/csh_swap/mf/Core/dollar/1.0:ProjectDIR/rt/csh_swap/mf/Core/unix/unix.lua:ProjectDIR/rt/csh_swap/mf/Core/local/1.3.lua:ProjectDIR/rt/csh_swap/mf/Core/noweb/2.10c.lua:ProjectDIR/rt/csh_swap/mf/Core/PrgEnv.lua:ProjectDIR/rt/csh_swap/mf/Core2/ml/1.0.lua:ProjectDIR/rt/csh_swap/mf/Core2/minfo/1.0:ProjectDIR/rt/csh_swap/mf/Core/intel/intel.lua:ProjectDIR/rt/csh_swap/mf/Compiler/intel/10.1/openmpi/1.2.6.lua:ProjectDIR/rt/csh_swap/mf/MPI/intel/10.1/openmpi/1.2.6/parmetis/3.1.lua;lua159,34445 rt/symlink/out.txt,734 export __LMOD_REF_COUNT_MODULEPATH;10,319 @@ -15317,43 +15721,43 @@ export PATH;38,2193 _LMFILES_=39,2206 export _LMFILES_;40,2443 _ModuleTable_=41,2461 -export _ModuleTable_;42,3554 -export __LMOD_REF_COUNT_MODULEPATH;48,3879 -MODULEPATH=49,3915 -export MODULEPATH;50,4036 -_ModuleTable_=51,4055 -export _ModuleTable_;52,5182 -export FOO;58,5347 -LOADEDMODULES=59,5359 -export LOADEDMODULES;60,5433 -MODULEPATH=61,5455 -export MODULEPATH;62,5576 -_LMFILES_=63,5595 -export _LMFILES_;64,5876 -_ModuleTable_=65,5894 -export _ModuleTable_;66,7188 -export LOADEDMODULES;72,7436 -MODULEPATH=73,7458 -export MODULEPATH;74,7579 -__LMOD_REF_COUNT_PATH=75,7598 -export __LMOD_REF_COUNT_PATH;76,7829 -PATH=77,7859 -export PATH;78,8050 -_LMFILES_=79,8063 -export _LMFILES_;80,8432 -_ModuleTable_=81,8450 -export _ModuleTable_;82,10083 -export LOADEDMODULES;88,10313 -MODULEPATH=89,10335 -export MODULEPATH;90,10456 -__LMOD_REF_COUNT_PATH=91,10475 -export __LMOD_REF_COUNT_PATH;92,10686 -PATH=93,10716 -export PATH;94,10890 -_LMFILES_=95,10903 -export _LMFILES_;96,11184 -_ModuleTable_=97,11202 -export _ModuleTable_;98,12496 +export _ModuleTable_;42,3646 +export __LMOD_REF_COUNT_MODULEPATH;48,3971 +MODULEPATH=49,4007 +export MODULEPATH;50,4128 +_ModuleTable_=51,4147 +export _ModuleTable_;52,5366 +export FOO;58,5531 +LOADEDMODULES=59,5543 +export LOADEDMODULES;60,5617 +MODULEPATH=61,5639 +export MODULEPATH;62,5760 +_LMFILES_=63,5779 +export _LMFILES_;64,6060 +_ModuleTable_=65,6078 +export _ModuleTable_;66,7464 +export LOADEDMODULES;72,7712 +MODULEPATH=73,7734 +export MODULEPATH;74,7855 +__LMOD_REF_COUNT_PATH=75,7874 +export __LMOD_REF_COUNT_PATH;76,8105 +PATH=77,8135 +export PATH;78,8326 +_LMFILES_=79,8339 +export _LMFILES_;80,8708 +_ModuleTable_=81,8726 +export _ModuleTable_;82,10451 +export LOADEDMODULES;88,10681 +MODULEPATH=89,10703 +export MODULEPATH;90,10824 +__LMOD_REF_COUNT_PATH=91,10843 +export __LMOD_REF_COUNT_PATH;92,11054 +PATH=93,11084 +export PATH;94,11258 +_LMFILES_=95,11271 +export _LMFILES_;96,11552 +_ModuleTable_=97,11570 +export _ModuleTable_;98,12956 rt/use_append/use_append.tdesc,19 testdescript 2,15 @@ -15370,13 +15774,13 @@ export MODULEPATH;14,601 _LMFILES_=15,620 export _LMFILES_;16,671 _ModuleTable_=17,689 -export _ModuleTable_;18,1088 -export MODULEPATH;24,1359 -_ModuleTable_=25,1378 -export _ModuleTable_;26,1777 -export MODULEPATH;32,2041 -_ModuleTable_=33,2060 -export _ModuleTable_;34,2459 +export _ModuleTable_;18,1238 +export MODULEPATH;24,1509 +_ModuleTable_=25,1528 +export _ModuleTable_;26,2077 +export MODULEPATH;32,2341 +_ModuleTable_=33,2360 +export _ModuleTable_;34,2909 rt/pyHier/pyHier.tdesc,21 local testName 2,15 @@ -15394,38 +15798,38 @@ export MODULEPATH;18,565 _LMFILES_=19,584 export _LMFILES_;20,722 _ModuleTable_=21,740 -export _ModuleTable_;22,1436 -export MODULEPATH;28,1655 -_ModuleTable_=29,1674 -export _ModuleTable_;30,2370 -unset B;36,2536 -unset LOADEDMODULES;37,2545 -__LMOD_REF_COUNT_MODULEPATH=38,2566 -export __LMOD_REF_COUNT_MODULEPATH;39,2626 -MODULEPATH=40,2662 -export MODULEPATH;41,2703 -unset _LMFILES_;42,2722 -_ModuleTable_=43,2739 -export _ModuleTable_;44,3211 -export MODULEPATH;50,3400 -_ModuleTable_=51,3419 -export _ModuleTable_;52,3891 -export A;58,4053 -B=59,4063 -export B;60,4070 -LOADEDMODULES=61,4080 -export LOADEDMODULES;62,4121 -__LMOD_REF_COUNT_MODULEPATH=63,4143 -export __LMOD_REF_COUNT_MODULEPATH;64,4236 -MODULEPATH=65,4272 -export MODULEPATH;66,4343 -_LMFILES_=67,4362 -export _LMFILES_;68,4500 -_ModuleTable_=69,4518 -export _ModuleTable_;70,5214 -export MODULEPATH;76,5433 -_ModuleTable_=77,5452 -export _ModuleTable_;78,6148 +export _ModuleTable_;22,1512 +export MODULEPATH;28,1731 +_ModuleTable_=29,1750 +export _ModuleTable_;30,2522 +unset B;36,2688 +unset LOADEDMODULES;37,2697 +__LMOD_REF_COUNT_MODULEPATH=38,2718 +export __LMOD_REF_COUNT_MODULEPATH;39,2778 +MODULEPATH=40,2814 +export MODULEPATH;41,2855 +unset _LMFILES_;42,2874 +_ModuleTable_=43,2891 +export _ModuleTable_;44,3363 +export MODULEPATH;50,3552 +_ModuleTable_=51,3571 +export _ModuleTable_;52,4043 +export A;58,4205 +B=59,4215 +export B;60,4222 +LOADEDMODULES=61,4232 +export LOADEDMODULES;62,4273 +__LMOD_REF_COUNT_MODULEPATH=63,4295 +export __LMOD_REF_COUNT_MODULEPATH;64,4388 +MODULEPATH=65,4424 +export MODULEPATH;66,4495 +_LMFILES_=67,4514 +export _LMFILES_;68,4652 +_ModuleTable_=69,4670 +export _ModuleTable_;70,5442 +export MODULEPATH;76,5661 +_ModuleTable_=77,5680 +export _ModuleTable_;78,6452 rt/user_inherit/out.txt,1238 export __LMOD_REF_COUNT_MODULEPATH;10,367 @@ -15451,28 +15855,28 @@ export PATH;34,1796 _LMFILES_=35,1809 export _LMFILES_;36,1875 _ModuleTable_=37,1893 -export _ModuleTable_;38,2576 -export MODULEPATH;44,2913 -_ModuleTable_=45,2932 -export _ModuleTable_;46,3615 -export MODULEPATH;52,3957 -_ModuleTable_=53,3976 -export _ModuleTable_;54,4659 -export MODULEPATH;60,5001 -_ModuleTable_=61,5020 -export _ModuleTable_;62,5703 -export LOADEDMODULES;68,5893 -MODULEPATH=69,5915 -export MODULEPATH;70,6103 -MY_VERSION=71,6122 -export MY_VERSION;72,6138 -_LMFILES_=73,6157 -export _LMFILES_;74,6290 -_ModuleTable_=75,6308 -export _ModuleTable_;76,7193 -export MODULEPATH;82,7529 -_ModuleTable_=83,7548 -export _ModuleTable_;84,8433 +export _ModuleTable_;38,2758 +export MODULEPATH;44,3095 +_ModuleTable_=45,3114 +export _ModuleTable_;46,3979 +export MODULEPATH;52,4321 +_ModuleTable_=53,4340 +export _ModuleTable_;54,5205 +export MODULEPATH;60,5547 +_ModuleTable_=61,5566 +export _ModuleTable_;62,6431 +export LOADEDMODULES;68,6621 +MODULEPATH=69,6643 +export MODULEPATH;70,6831 +MY_VERSION=71,6850 +export MY_VERSION;72,6866 +_LMFILES_=73,6885 +export _LMFILES_;74,7018 +_ModuleTable_=75,7036 +export _ModuleTable_;76,8103 +export MODULEPATH;82,8439 +_ModuleTable_=83,8458 +export _ModuleTable_;84,9525 rt/user_inherit/user_inherit.tdesc,21 local testName 2,15 @@ -15721,7 +16125,7 @@ docs/source/250_site_package.rst,39 docs/source/170_hooks.rst,72 function prependModulePath(48,1830 - function myMsgHook(191,6264 + function myMsgHook(193,6350 docs/source/210_load_storms.rst,89 Load Storms: Long load times or Fails to Load1,0 @@ -15818,11 +16222,15 @@ function built-built157,5776 docs/source/050_lua_modulefiles.rst,52 function to 58,2563 - function uses 215,8728 + function uses 214,8727 docs/source/093_modulerc.rst,30 .. _modulerc-label:label1,0 +docs/source/410_Lmod_principals.rst,52 + function in 117,3498 + function unsets 170,5916 + docs/source/136_spider.rst,21 The spider tool3,24 @@ -15870,13 +16278,13 @@ docs/source/120_shared_home_directories.rst,38 Lmod on Shared Home File Systems4,31 docs/source/010_user.rst,280 -It is rare,264,7995 -second load,292,8731 - family(306,9248 - export BASHRC_READ=455,15051 -then "**module restore**" will load the default A,568,18878 -then "**module restore**" will load the default A, B,568,18878 -If your site has a shared home file system,588,19624 +It is rare,275,8200 +second load,303,8936 + family(317,9453 + export BASHRC_READ=466,15256 +then "**module restore**" will load the default A,579,19083 +then "**module restore**" will load the default A, B,579,19083 +If your site has a shared home file system,599,19829 docs/source/320_improving_perf.rst,36 .. _improving_perf-label:label1,0 @@ -15897,75 +16305,77 @@ Sticky Modules3,27 build.rtm,440 PKG_VERSION=3,35 -save_old_version(26,823 -make_symlink(38,1136 -runMe(48,1442 -BUILD_TYPE=78,1927 - BUILD_TYPE=80,1974 -myhost=89,2143 -first=90,2167 -SYSHOST=91,2187 -SUDO=92,2208 - MY_ARCH=95,2255 - MAKE_EXTRA=107,2479 - EXTRA=127,3197 - SUDO=132,3310 - base=143,3659 - UPDATE_FN=148,3829 - base=156,4072 - base=158,4137 - ADMIN_DIR=170,4465 -BASE_DIR=178,4715 - EXTRA_CMD=181,4759 - MAKE=192,4938 - -configure.ac,1217 +save_old_version(30,886 +make_symlink(42,1199 +runMe(52,1505 +BUILD_TYPE=82,1990 + BUILD_TYPE=84,2037 +myhost=93,2206 +first=94,2230 +SYSHOST=95,2250 +SUDO=96,2271 + MY_ARCH=99,2318 + MAKE_EXTRA=111,2542 + EXTRA=131,3238 + SUDO=136,3351 + base=147,3707 + UPDATE_FN=152,3877 + base=160,4120 + base=162,4185 + ADMIN_DIR=174,4513 +BASE_DIR=182,4763 + EXTRA_CMD=185,4807 + MAKE=196,4986 + +configure.ac,1250 FOLLOW_READLINK 23,294 -AC_SUBST(46,691 - AC_MSG_RESULT(657,26818 - AC_MSG_RESULT(673,27332 - FAST_TCL_INTERP=696,28097 - OS=700,28162 - DIR=702,28213 - TCL_INCLUDE=707,28396 - AC_PATH_PROG(714,28504 - TCL_INCLUDE=719,28723 - AC_MSG_ERROR(734,29170 - mode=766,30122 -AC_PATH_PROG(779,30407 -AC_PATH_PROG(788,30575 -AC_PATH_PROGS(797,30773 -AC_PATH_PROGS(806,30973 -AC_PATH_PROGS(815,31207 -AC_PATH_PROG(824,31373 - PATH_TO_HASHSUM=829,31617 -AC_PATH_PROG(838,31842 -AC_PATH_PROGS(846,32072 - PATH_TO_LUA=865,32584 - mismatch=871,32782 - mismatch=874,32886 - AC_PATH_PROG(890,33246 - AC_PATH_PROG(901,33531 - lmodV=912,33960 - LUA_PATH=930,34459 - missingModules=952,35357 - AC_SUBST(969,35693 - missingModules=977,35928 - lfsV=984,36032 - AC_SUBST(989,36216 - missingModules=998,36438 - AC_SUBST(1005,36558 -PATH_TO_LUA_DIR=1016,36695 - LUA_INCLUDE=1021,36764 - AC_PATH_PROG(1025,36846 - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1028,36955 - LUA_INCLUDE=1030,37044 - LUA_INCLUDE=1040,37351 -AC_SUBST(1061,37737 - resultA=1067,37875 - result=1081,38126 - ORIG_ZSH_VERSION=1101,38596 - ZSH_FPATH=1115,38827 +ERR_MSG=45,690 + AC_MSG_RESULT(660,26862 + AC_MSG_RESULT(677,27395 + FAST_TCL_INTERP=700,28160 + OS=704,28225 + DIR=706,28276 + TCL_INCLUDE=711,28459 + AC_PATH_PROG(718,28567 + TCL_INCLUDE=723,28786 + FOUND_ERROR=738,29233 +PATH_TO_SRC=758,29990 + mode=774,30282 +MSG=777,30358 +AC_PATH_PROG(799,30747 +AC_PATH_PROGS(808,30945 +AC_PATH_PROGS(817,31145 +AC_PATH_PROGS(826,31379 +AC_PATH_PROG(835,31545 + PATH_TO_HASHSUM=842,31846 +AC_PATH_PROG(851,32071 +AC_PATH_PROGS(859,32301 + PATH_TO_LUA=878,32813 + mismatch=884,33011 + mismatch=887,33115 + AC_PATH_PROG(903,33475 + AC_PATH_PROG(914,33760 + lmodV=925,34189 + LUA_PATH=943,34688 + missingModules=965,35586 + AC_SUBST(982,35922 + missingModules=990,36157 + lfsV=997,36261 + AC_SUBST(1002,36445 + missingModules=1011,36667 + AC_SUBST(1018,36787 +PATH_TO_LUA_DIR=1029,36924 + LUA_INCLUDE=1034,36993 + AC_PATH_PROG(1038,37075 + PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1041,37184 + LUA_INCLUDE=1043,37273 + LUA_INCLUDE=1053,37580 + exit 1085,38310 +AC_SUBST(1088,38330 + resultA=1094,38468 + result=1108,38719 + ORIG_ZSH_VERSION=1128,39189 + ZSH_FPATH=1142,39420 tools/Optiks_Option.lua,263 function M.optionNames(65,2309 @@ -16091,7 +16501,7 @@ function MF_TCL.header(header95,3400 tools/TermWidth.lua,64 local function l_askSystem(49,1883 -function TermWidth(80,2594 +function TermWidth(74,2477 tools/Cosmic.lua,654 function M.singleton(54,2164 @@ -16271,10 +16681,10 @@ tools/serializeTbl.lua,180 local function l_quoteValue(67,2556 local function l_nsformat(79,2839 local function wrap_name(112,3897 -local function outputTblHelper(129,4394 -function serializeTbl(235,7258 +local function outputTblHelper(129,4393 +function serializeTbl(235,7257 -tools/Optiks.lua,1391 +tools/Optiks.lua,1471 local function l_argsPack(33,1446 function Optiks_Error(42,1780 function Optiks_Exit(52,1983 @@ -16282,38 +16692,40 @@ local function l_prt(81,2671 local function l_prtend(85,2723 function M.new(92,2916 function M.new(new92,2916 -function M.add_option(150,4297 -function M.add_option(add_option150,4297 -function M._getValue(186,5491 -function M._getValue(_getValue186,5491 -function M.store(212,6299 -function M.store(store212,6299 -function M.store_true(225,6810 -function M.store_true(store_true225,6810 -function M.append(238,7328 -function M.append(append238,7328 -function M.store_false(255,7918 -function M.store_false(store_false255,7918 -function M.count(268,8433 -function M.count(count268,8433 -function M.display_store(278,8733 -function M.display_store(display_store278,8733 -function M.display_flag(298,9249 -function M.display_flag(display_flag298,9249 -function M.display_count(311,9603 -function M.display_count(display_count311,9603 -function M.setDefaults(319,9870 -function M.setDefaults(setDefaults319,9870 -function M.parseOpt(334,10412 -function M.parseOpt(parseOpt334,10412 -function M.buildHelpMsg(347,10863 -function M.buildHelpMsg(buildHelpMsg347,10863 -function M.printHelp(370,11474 -function M.printHelp(printHelp370,11474 -function M.parseEnvArg(380,11759 -function M.parseEnvArg(parseEnvArg380,11759 -function M.parse(435,13111 -function M.parse(parse435,13111 +function M.add_option(154,4398 +function M.add_option(add_option154,4398 +function M._getValue(190,5592 +function M._getValue(_getValue190,5592 +function M.store(216,6400 +function M.store(store216,6400 +function M.store_true(229,6911 +function M.store_true(store_true229,6911 +function M.append(242,7429 +function M.append(append242,7429 +function M.store_false(259,8019 +function M.store_false(store_false259,8019 +function M.count(272,8534 +function M.count(count272,8534 +function M.display_store(282,8834 +function M.display_store(display_store282,8834 +function M.display_flag(302,9350 +function M.display_flag(display_flag302,9350 +function M.display_count(315,9704 +function M.display_count(display_count315,9704 +function M.setDefaults(323,9971 +function M.setDefaults(setDefaults323,9971 +function M.parseOpt(338,10513 +function M.parseOpt(parseOpt338,10513 +function M.buildHelpMsg(351,10964 +function M.buildHelpMsg(buildHelpMsg351,10964 +function M.printHelp(374,11588 +function M.printHelp(printHelp374,11588 +function M.buildManPod(379,11669 +function M.buildManPod(buildManPod379,11669 +function M.parseEnvArg(406,12421 +function M.parseEnvArg(parseEnvArg406,12421 +function M.parse(461,13773 +function M.parse(parse461,13773 tools/json.lua,592 function json.encode 67,2820 @@ -16502,7 +16914,7 @@ project 1,0 topics 8,194 format=9,288 -Makefile.in,5373 +Makefile.in,5413 srcdir 1,0 prefix 2,38 SYS_LUA_PATH 3,76 @@ -16549,168 +16961,169 @@ SILENCE_SHELL_DEBUGGING 51,2409 SYS_LD_LIB_PATH 52,2464 SYS_LD_PRELOAD 53,2511 CASE_INDEPENDENT_SORTING 54,2557 -ORIG_ZSH_VERSION 55,2613 -ZSH_SITE_FUNCTIONS_DIRS 56,2661 -ZSH_FPATH 57,2716 -SPIDER_CACHE_DESCRIPT_FN 58,2757 -ANCIENT 59,2813 -ALLOW_TCL_MFILES 60,2852 -MPATH_AVAIL 61,2900 -EXTENDED_DEFAULT 62,2943 -TMOD_PATH_RULE 63,2991 -TMOD_FIND_FIRST 64,3037 -CACHED_LOADS 65,3084 -EXACT_MATCH 66,3128 -DUPLICATE_PATHS 67,3171 -DISABLE_NAME_AUTOSWAP 68,3218 -SHORT_TIME 69,3271 -PIN_VERSIONS 70,3313 -AUTO_SWAP 71,3357 -SPIDER_CACHE_DIRS 72,3398 -LEGACY_ORDERING 73,3447 -EXPORT_MODULE 74,3494 -LMOD_DOWNSTREAM_CONFLICTS 75,3539 -MODULES_AUTO_HANDLING 76,3596 -BASENAME 77,3649 -UPDATE_VERSION 78,3689 -BUILD_V_src 79,3816 -PS 80,3975 -READLINK 81,4009 -EXPR 82,4049 -MODULES_AUTO_HANDLING 83,4085 -PATH_TO_HASHSUM 84,4138 -PATH_TO_LUAC 85,4185 -PATH_TO_PAGER 86,4229 -PATH_TO_TCLSH 87,4274 -PATH_TO_LS 88,4319 -MODULEPATH_ROOT 89,4361 -VDateFn 90,4408 -VERSION_SRC 91,4460 -SETTARG_VSRC 92,4515 -LUA_INCLUDE 93,4574 -UPDATE_SYSTEM_FN 94,4617 -GIT_PROG 95,4665 -PKG 96,4708 -PKGV 97,4755 -LIB 98,4798 -LIBEXEC 99,4845 -SHELLS 100,4896 -TOOLS 101,4946 -I18N 102,4995 -SETTARG 103,5049 -INIT 104,5100 -INIT_KSH_FUNCS 105,5148 -FISH_TAB 106,5206 -MESSAGEDIR 107,5274 -LMOD_MF 108,5328 -MAN_PAGES 109,5388 -LMOD_MF_SOURCE 110,5446 -SETTARG_SOURCE 111,5520 -DATE_cmd 112,5608 -UNAME_S 113,5669 -VersionDate 114,5716 -MODE 115,5769 - SED 118,5831 - SED 120,5855 -MODE_X 123,5880 -MODE_R 124,5946 - LUA_INCLUDE 128,6039 - LUA_INCLUDE 130,6062 - GIT_VERSION 133,6126 - GIT_BRANCH 137,6319 -DIRLIST 141,6540 -STANDALONE_PRGM 146,6955 -STANDALONE_PRGM 154,7609 -SHELL_INIT 155,7685 -SHELL_INIT 158,7922 -LMODRC_INIT 159,7998 -ZSH_FUNCS 162,8073 -ZSH_FUNCS 163,8114 -FISH_FUNCS 165,8194 -FISH_FUNCS 166,8238 -KSH_FUNCS 168,8320 -KSH_FUNCS 169,8385 -STARTUP 171,8471 -STARTUP 172,8550 -MSGFNs 174,8624 -MAIN_DIR 176,8693 -CONTRIB_DIRS 179,8837 -CONTRIB 192,9579 -lua_code 193,9660 -lua_code 194,9745 -CurDATE 195,9859 -ComputeHashSum 197,9926 -spiderCacheSupportCMD 198,9991 -export L_PATH export L_PATH199,10075 -export L_CPATH export L_CPATH200,10117 -HAVE_LUA_TERM 202,10161 - PKGS 204,10235 -HAVE_LUAFILESYSTEM 206,10256 - PKGS 208,10340 - PKG_LFS 209,10362 -FAST_TCL_INTERP 211,10385 -TCL_INCLUDE 212,10432 -TCL_LIBS 213,10468 - PKGS 215,10531 - PKG_T2L 216,10560 -.PHONY:.PHONY219,10588 -all:all221,10617 -uninstall:uninstall224,10635 -pre-install:pre-install228,10757 -lmod_install_targets:lmod_install_targets230,10803 -install:install235,11094 -echo:echo250,12039 -man_pages:man_pages255,12142 - LUA_PATH=257,12253 -$(DIRLIST)$(DIRLIST261,12486 -__installMe:__installMe264,12528 -generate_doc:generate_doc353,19363 -shell_init:shell_init356,19386 -lmodrc_init:lmodrc_init359,19500 -messageFns:messageFns362,19618 -i18n:i18n365,19734 -startup:startup368,19840 -other_tools:other_tools371,19950 -spiderCacheSupport:spiderCacheSupport374,20091 -src/computeHashSum:src/computeHashSum381,20489 -tcl2lua:tcl2lua385,20634 - $(MAKE) -C $(srcdir)/pkgs/tcl2lua LUA_INC=$(MAKE) -C $(srcdir)/pkgs/tcl2lua LUA_INC387,20713 - LIB=389,20860 - SHARE=390,20937 -lfs:lfs394,21103 - $(MAKE) -C $(srcdir)/pkgs/luafilesystem LUA_INC=$(MAKE) -C $(srcdir)/pkgs/luafilesystem LUA_INC396,21178 - LIB=397,21255 - MODE_R=398,21332 -pkgs:pkgs401,21497 - $(MAKE) -C $(srcdir)/pkgs LUA_INC=$(MAKE) -C $(srcdir)/pkgs LUA_INC403,21573 - LIB=404,21650 - MODE_R=405,21727 -zsh_tab_funcs:zsh_tab_funcs409,21893 -ksh_funcs:ksh_funcs424,22798 -fish_tab_funcs:fish_tab_funcs427,22920 -makefile:makefile430,23010 -config.status:config.status433,23079 -trailing_blanks_removed:trailing_blanks_removed436,23122 -dist:dist439,23267 -ml_dist:ml_dist459,24688 -_ml_dist:_ml_dist462,24727 -test:test471,25173 -tags:tags474,25211 -build_tags:build_tags477,25248 -busted:busted541,28879 -luachk:luachk548,29234 -libexec:libexec552,29393 -VersionSrc:VersionSrc555,29506 -STVersionSrc:STVersionSrc558,29648 -Inst_Tools:Inst_Tools561,29804 -Inst_Shells:Inst_Shells564,29917 -Inst_Settarg:Inst_Settarg567,30043 -Inst_Lmod_MF:Inst_Lmod_MF571,30167 -clean:clean574,30290 -clobber:clobber580,30534 -distclean:distclean582,30550 -world_update:world_update585,30600 -gittag:gittag611,32542 +ZSH_SITE_FUNCTIONS_DIRS 55,2613 +SPIDER_CACHE_DESCRIPT_FN 56,2668 +ANCIENT 57,2724 +ALLOW_TCL_MFILES 58,2763 +MPATH_AVAIL 59,2811 +EXTENDED_DEFAULT 60,2854 +TMOD_PATH_RULE 61,2902 +TMOD_FIND_FIRST 62,2948 +CACHED_LOADS 63,2995 +EXACT_MATCH 64,3039 +DUPLICATE_PATHS 65,3082 +DISABLE_NAME_AUTOSWAP 66,3129 +SHORT_TIME 67,3182 +PIN_VERSIONS 68,3224 +AUTO_SWAP 69,3268 +SPIDER_CACHE_DIRS 70,3309 +LEGACY_ORDERING 71,3358 +EXPORT_MODULE 72,3405 +LMOD_DOWNSTREAM_CONFLICTS 73,3450 +MODULES_AUTO_HANDLING 74,3507 +BASENAME 75,3560 +UPDATE_VERSION 76,3600 +BUILD_V_src 77,3727 +PS 78,3886 +READLINK 79,3920 +EXPR 80,3960 +MODULES_AUTO_HANDLING 81,3996 +PATH_TO_POD2MAN 82,4049 +PATH_TO_HASHSUM 83,4096 +PATH_TO_LUAC 84,4143 +PATH_TO_PAGER 85,4187 +PATH_TO_TCLSH 86,4232 +PATH_TO_LS 87,4277 +MODULEPATH_ROOT 88,4319 +VDateFn 89,4366 +VERSION_SRC 90,4418 +SETTARG_VSRC 91,4473 +LUA_INCLUDE 92,4532 +UPDATE_SYSTEM_FN 93,4575 +GIT_PROG 94,4623 +PKG 95,4666 +PKGV 96,4713 +LIB 97,4756 +LIBEXEC 98,4803 +SHELLS 99,4854 +TOOLS 100,4904 +I18N 101,4953 +SETTARG 102,5007 +INIT 103,5058 +INIT_KSH_FUNCS 104,5106 +FISH_TAB 105,5164 +MESSAGEDIR 106,5232 +LMOD_MF 107,5286 +MAN_PAGES_CAT 108,5346 +MAN_PAGES 109,5404 +LMOD_MF_SOURCE 110,5462 +SETTARG_SOURCE 111,5536 +DATE_cmd 112,5624 +UNAME_S 113,5685 +VersionDate 114,5732 +MODE 115,5785 + SED 118,5847 + SED 120,5871 +MODE_X 123,5896 +MODE_R 124,5962 + LUA_INCLUDE 128,6055 + LUA_INCLUDE 130,6078 + GIT_VERSION 133,6142 + GIT_BRANCH 137,6335 +DIRLIST 141,6556 +STANDALONE_PRGM 147,7042 +STANDALONE_PRGM 155,7696 +SHELL_INIT 156,7772 +SHELL_INIT 159,8009 +LMODRC_INIT 160,8085 +ZSH_FUNCS 163,8160 +ZSH_FUNCS 164,8201 +FISH_FUNCS 166,8281 +FISH_FUNCS 167,8325 +KSH_FUNCS 169,8407 +KSH_FUNCS 170,8472 +STARTUP 172,8558 +STARTUP 173,8637 +MSGFNs 175,8711 +MAIN_DIR 177,8780 +CONTRIB_DIRS 180,8924 +CONTRIB 193,9666 +lua_code 194,9747 +lua_code 195,9832 +CurDATE 196,9946 +ComputeHashSum 198,10013 +spiderCacheSupportCMD 199,10078 +export L_PATH export L_PATH200,10162 +export L_CPATH export L_CPATH201,10204 +HAVE_LUA_TERM 203,10248 + PKGS 205,10322 +HAVE_LUAFILESYSTEM 207,10343 + PKGS 209,10427 + PKG_LFS 210,10449 +FAST_TCL_INTERP 212,10472 +TCL_INCLUDE 213,10519 +TCL_LIBS 214,10555 + PKGS 216,10618 + PKG_T2L 217,10647 +.PHONY:.PHONY220,10675 +all:all222,10704 +uninstall:uninstall225,10722 +pre-install:pre-install229,10844 +lmod_install_targets:lmod_install_targets231,10890 +install:install236,11181 +echo:echo251,12126 +man_pages:man_pages256,12229 + LUA_PATH=259,12419 + LUA_PATH=264,12757 +$(DIRLIST)$(DIRLIST271,13148 +__installMe:__installMe274,13190 +generate_doc:generate_doc361,19867 +shell_init:shell_init364,19890 +lmodrc_init:lmodrc_init367,20004 +messageFns:messageFns370,20122 +i18n:i18n373,20238 +startup:startup376,20344 +other_tools:other_tools379,20454 +spiderCacheSupport:spiderCacheSupport382,20595 +src/computeHashSum:src/computeHashSum389,20993 +tcl2lua:tcl2lua393,21138 + $(MAKE) -C $(srcdir)/pkgs/tcl2lua LUA_INC=$(MAKE) -C $(srcdir)/pkgs/tcl2lua LUA_INC395,21217 + LIB=397,21364 + SHARE=398,21441 +lfs:lfs402,21607 + $(MAKE) -C $(srcdir)/pkgs/luafilesystem LUA_INC=$(MAKE) -C $(srcdir)/pkgs/luafilesystem LUA_INC404,21682 + LIB=405,21759 + MODE_R=406,21836 +pkgs:pkgs409,22001 + $(MAKE) -C $(srcdir)/pkgs LUA_INC=$(MAKE) -C $(srcdir)/pkgs LUA_INC411,22077 + LIB=412,22154 + MODE_R=413,22231 +zsh_tab_funcs:zsh_tab_funcs417,22397 +ksh_funcs:ksh_funcs432,23302 +fish_tab_funcs:fish_tab_funcs435,23424 +makefile:makefile438,23514 +config.status:config.status441,23583 +trailing_blanks_removed:trailing_blanks_removed444,23626 +dist:dist447,23771 +ml_dist:ml_dist467,25192 +_ml_dist:_ml_dist470,25231 +test:test479,25677 +tags:tags482,25715 +build_tags:build_tags485,25752 +busted:busted549,29383 +luachk:luachk556,29738 +libexec:libexec560,29897 +VersionSrc:VersionSrc563,30010 +STVersionSrc:STVersionSrc566,30152 +Inst_Tools:Inst_Tools569,30308 +Inst_Shells:Inst_Shells572,30421 +Inst_Settarg:Inst_Settarg575,30547 +Inst_Lmod_MF:Inst_Lmod_MF579,30671 +clean:clean582,30794 +clobber:clobber588,31038 +distclean:distclean590,31054 +world_update:world_update593,31104 +gittag:gittag619,33046 my_docs/17/TACC_sysadmin_17/example.tex,38 \section{First Section} First24,501 @@ -19224,8 +19637,6 @@ spec/MName/mf/bio/g.lua,0 tools/i18n/version.lua,0 -docs/source/410_Lmod_principals.rst,0 - docs/source/conf.py,0 docs/source/internal_struct.org,0 @@ -19706,6 +20117,12 @@ rt/petsc/mf/MPI/intel/13.1/mvapich2/1.9/petsc/petsc/.version.3.3-uni,0 rt/funny_files/err.txt,0 +rt/restore_reset/err.txt,0 + +rt/restore_reset/mf/Core/gcc/13.2.0.lua,0 + +rt/restore_reset/mf/Core/git/2.40.1.lua,0 + rt/between/err.txt,0 rt/between/mf/Core/Md.lua,0 @@ -19786,6 +20203,18 @@ rt/rstats/mf/Core/Rpkgs/3.4.0.lua,0 rt/rstats/mf/Core/Rstats/3.4.0.lua,0 +rt/mpathColl/err.txt,0 + +rt/mpathColl/mf/Core/gcc/13.0.lua,0 + +rt/mpathColl/mf/Core/acme/1.0.lua,0 + +rt/mpathColl/mf/Compiler/gcc/13/mpich/13.0.lua,0 + +rt/mpathColl/mf/MPI/.base/petsc/3.24.lua,0 + +rt/mpathColl/mf/MPI/.base/phdf5/1.14.3.lua,0 + rt/mixed/err.txt,0 rt/mixed/mf/Core/compilers/intel/14.0.0.lua,0 @@ -19894,6 +20323,10 @@ rt/manpath/err.txt,0 rt/manpath/mf/Core/unix/1.0.lua,0 +rt/manpath/mf/Core/abc/1.0.lua,0 + +rt/manpath/mf/Core/def/2.0.lua,0 + rt/manpath/mf/Core/noweb/2.11b.lua,0 rt/changeMPATH/err.txt,0 @@ -21000,6 +21433,14 @@ rt/lars/mf/Compiler/intel/13.0/impi/4.1.lua,0 rt/lars/mf/Compiler/intel/13.0/mvapich2/1.9a2.lua,0 +rt/hidden/mf2/top/A/1.0.lua,0 + +rt/hidden/mf2/top/B/.9.8.7.lua,0 + +rt/hidden/mf2/bottom/A/2.0.lua,0 + +rt/hidden/mf2/bottom/B/9.8.7.lua,0 + rt/hidden/err.txt,0 rt/hidden/mf/lmod.lua,0 @@ -21876,9 +22317,11 @@ rt/depends_on_any/mf2/Core/python3/1.0.lua,0 rt/depends_on_any/mf2/Core/A/1.0.lua,0 +rt/depends_on_any/err.txt,0 + rt/depends_on_any/mf/Core/none.lua,0 -rt/depends_on_any/mf/Core/AA/1.0.lua,0 +rt/depends_on_any/mf/Core/AA/2.0,0 rt/depends_on_any/mf/Core/bar/1.2.lua,0 @@ -24666,6 +25109,18 @@ rt/depends_on/mf/Core3/A/1.0.lua,0 rt/depends_on/mf/Core3/B/2.0.lua,0 +rt/depends_on/mf/Core6/none.lua,0 + +rt/depends_on/mf/Core6/possible.lua,0 + +rt/depends_on/mf/Core6/d/1.0.lua,0 + +rt/depends_on/mf/Core6/b/1.0.lua,0 + +rt/depends_on/mf/Core6/already.lua,0 + +rt/depends_on/mf/Core6/f/1.0.lua,0 + rt/depends_on/mf/Issue604/gcc/python3/1.0.lua,0 rt/depends_on/mf/Issue604/intel/python3/1.0.lua,0 @@ -24708,6 +25163,8 @@ rt/depends_on/mf/Core4/python/.modulerc.lua,0 rt/depends_on/mf/Core4/ipykernel/2022a.lua,0 +rt/depends_on/mf/Core/X,0 + rt/depends_on/mf/Core/bar/1.2.lua,0 rt/depends_on/mf/Core/bar/1.4.lua,0 @@ -24724,8 +25181,6 @@ rt/depends_on/mf/Core/Y.lua,0 rt/depends_on/mf/Core/Z.lua,0 -rt/depends_on/mf/Core/X.lua,0 - rt/depends_on/mf/Core5/impi/19.0.7.lua,0 rt/depends_on/mf/special/oneapi22/impi/22.1.lua,0 From 0cf26a3dd01f3dddf77e558e6ff37296c91b4e5e Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Fri, 9 Aug 2024 17:32:16 -0600 Subject: [PATCH 073/198] switch ignoreT to s_ignoreT and defaultT to s_defaultT --- src/DirTree.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/DirTree.lua b/src/DirTree.lua index 85222d6df..e7e521c0e 100644 --- a/src/DirTree.lua +++ b/src/DirTree.lua @@ -58,7 +58,7 @@ end local load = (_VERSION == "Lua 5.1") and loadstring or load -local ignoreT = { +local s_ignoreT = { ['.'] = true, ['..'] = true, ['.git'] = true, @@ -68,7 +68,7 @@ local ignoreT = { ['.DS_Store'] = true, } -local defaultFnT = { +local s_defaultFnT = { default = 1, ['.modulerc.lua'] = 2, ['.modulerc'] = 3, @@ -80,7 +80,7 @@ local function l_keepFile(fn) local lastChar = fn:sub(-1,-1) local firstTwo = fn:sub(1,2) - local result = not (ignoreT[fn] or lastChar == '~' or firstChar == '#' or + local result = not (s_ignoreT[fn] or lastChar == '~' or firstChar == '#' or lastChar == '#' or firstTwo == '.#' or firstTwo == '__') if (not result) then return false @@ -90,7 +90,7 @@ local function l_keepFile(fn) return false end - if (defaultFnT[fn]) then + if (s_defaultFnT[fn]) then return true end @@ -192,7 +192,7 @@ local function l_walk(mrc, mpath, path, dirA, fileT, regularFn) if (kind == "directory" and f ~= "." and f ~= "..") then dirA[#dirA + 1 ] = file elseif (kind == "file" or kind == "link") then - local dfltIdx = defaultFnT[f] + local dfltIdx = s_defaultFnT[f] local fullName = extractFullName(mpath, file) if (dfltIdx) then local luaExt = f:find("%.lua$") From 965b565d08297512260fe6e8b2d824ff03fdd70f Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Sat, 10 Aug 2024 13:08:46 -0600 Subject: [PATCH 074/198] Issue #690: Partial support for hide{} function. Support for MRC:isVisible to take visibleT --- TAGS | 373 ++++++++--------- TAGS.world | 979 ++++++++++++++++++++++---------------------- messageDir/en.lua | 3 + rt/dbT/err.txt | 2 +- rt/dbT/out.txt | 8 +- rt/modulerc/err.txt | 2 +- rt/modulerc/out.txt | 16 +- rt/spider/err.txt | 2 +- rt/spider/out.txt | 20 +- src/MN_Match.lua | 6 +- src/MName.lua | 102 +++-- src/MRC.lua | 64 +-- src/RC2lua.tcl | 10 +- src/mrc_funcs.lua | 33 +- src/mrc_sandbox.lua | 1 + src/utils.lua | 4 - 16 files changed, 839 insertions(+), 786 deletions(-) diff --git a/TAGS b/TAGS index a44f5ca4b..c5eb7f245 100644 --- a/TAGS +++ b/TAGS @@ -257,19 +257,19 @@ function M.prereq(69,2440 function M.prereq(prereq69,2440 src/DirTree.lua,468 -local function l_keepFile(78,2584 -local function l_checkValidModulefileReal(100,3093 -local function l_checkValidModulefileFake(112,3306 -local function l_walk_link(121,3583 -local function l_versionFile(142,4205 -local function l_walk(164,4914 -local function l_find_default(233,7727 -local function l_walk_tree(243,7889 -local function l_build(272,8767 -function M.new(294,9417 -function M.new(new294,9417 -function M.dirA(302,9560 -function M.dirA(dirA302,9560 +local function l_keepFile(78,2588 +local function l_checkValidModulefileReal(100,3100 +local function l_checkValidModulefileFake(112,3313 +local function l_walk_link(121,3590 +local function l_versionFile(142,4212 +local function l_walk(164,4921 +local function l_find_default(233,7738 +local function l_walk_tree(243,7900 +local function l_build(272,8778 +function M.new(294,9428 +function M.new(new294,9428 +function M.dirA(302,9571 +function M.dirA(dirA302,9571 src/clearLMOD_cmd.in.lua,290 function optionTbl(96,3118 @@ -729,8 +729,8 @@ function parseVersionParts(128,5315 function()(134,5466 src/MN_Match.lua,58 -function M.steps(48,1888 -function M.steps(steps48,1888 +function M.steps(48,1992 +function M.steps(steps48,1992 src/pager.lua,86 function bypassPager(60,2474 @@ -765,7 +765,7 @@ function M.date(date19,403 function M.name(20,458 function M.name(name20,458 -src/MRC.lua,1745 +src/MRC.lua,1750 local function l_new(77,2888 function M.singleton(110,4066 function M.singleton(singleton110,4066 @@ -776,40 +776,40 @@ local function l_save_su_weights(140,4685 local function l_su_weight_helper(148,4850 function M.parseModA(163,5202 function M.parseModA(parseModA163,5202 -function l_buildMod2VersionT(211,7106 -local function l_find_alias_value(280,8766 -function M.resolve(297,9173 -function M.resolve(resolve297,9173 -function M.getMod2VersionT(323,9917 -function M.getMod2VersionT(getMod2VersionT323,9917 -function M.getFull2AliasesT(330,10096 -function M.getFull2AliasesT(getFull2AliasesT330,10096 -function M.getAlias2ModT(337,10278 -function M.getAlias2ModT(getAlias2ModT337,10278 -local function l_store_mpathT(344,10453 -function M.parseModA_for_moduleA(355,10745 -function M.parseModA_for_moduleA(parseModA_for_moduleA355,10745 -function M.fullNameDfltT(408,12829 -function M.fullNameDfltT(fullNameDfltT408,12829 -function M.mrcMpathT(412,12896 -function M.mrcMpathT(mrcMpathT412,12896 -function M.extract(416,12952 -function M.extract(extract416,12952 -function M.export(423,13159 -function M.export(export423,13159 -local function l_getHiddenT(432,13455 -local function l_import_helper(459,14093 -function M.import(471,14369 -function M.import(import471,14369 -function M.isVisible(488,14880 -function M.isVisible(isVisible488,14880 -function M.update(514,15576 -function M.update(update514,15576 -function l_find_all_su_defaults(521,15724 -function M.find_wght_for_fullName(535,16086 -function M.find_wght_for_fullName(find_wght_for_fullName535,16086 -function M.applyWeights(589,17345 -function M.applyWeights(applyWeights589,17345 +function l_buildMod2VersionT(211,7136 +local function l_find_alias_value(280,8796 +function M.resolve(297,9203 +function M.resolve(resolve297,9203 +function M.getMod2VersionT(323,9947 +function M.getMod2VersionT(getMod2VersionT323,9947 +function M.getFull2AliasesT(330,10126 +function M.getFull2AliasesT(getFull2AliasesT330,10126 +function M.getAlias2ModT(337,10308 +function M.getAlias2ModT(getAlias2ModT337,10308 +local function l_store_mpathT(344,10483 +function M.parseModA_for_moduleA(355,10775 +function M.parseModA_for_moduleA(parseModA_for_moduleA355,10775 +function M.fullNameDfltT(408,12886 +function M.fullNameDfltT(fullNameDfltT408,12886 +function M.mrcMpathT(412,12953 +function M.mrcMpathT(mrcMpathT412,12953 +function M.extract(416,13009 +function M.extract(extract416,13009 +function M.export(423,13216 +function M.export(export423,13216 +local function l_findHiddenState(432,13512 +local function l_import_helper(470,14508 +function M.import(482,14784 +function M.import(import482,14784 +function M.isVisible(499,15295 +function M.isVisible(isVisible499,15295 +function M.update(528,16177 +function M.update(update528,16177 +function l_find_all_su_defaults(535,16325 +function M.find_wght_for_fullName(549,16687 +function M.find_wght_for_fullName(find_wght_for_fullName549,16687 +function M.applyWeights(603,17946 +function M.applyWeights(applyWeights603,17946 src/ReadLmodRC.lua,428 local function l_buildRC(55,2172 @@ -909,10 +909,10 @@ src/chkJson,23 function main(59,1566 src/mrc_sandbox.lua,74 -local function l_mrc_run5_1(79,3472 -local function l_mrc_run5_2(92,4148 +local function l_mrc_run5_1(80,3499 +local function l_mrc_run5_2(93,4175 -src/MName.lua,2965 +src/MName.lua,2907 function M.className(52,2104 function M.className(className52,2104 local function l_lessthan(56,2159 @@ -923,72 +923,71 @@ local function l_overRide_sType(158,5205 function M.buildA(167,5525 function M.buildA(buildA167,5525 local function l_lazyEval(183,5869 -function M.valid(278,9003 -function M.valid(valid278,9003 -function M.userName(286,9109 -function M.userName(userName286,9109 -function M.origUserName(290,9166 -function M.origUserName(origUserName290,9166 -function M.sn(294,9231 -function M.sn(sn294,9231 -function M.fn(303,9394 -function M.fn(fn303,9394 -function M.version(312,9557 -function M.version(version312,9557 -function M.wV(319,9669 -function M.wV(wV319,9669 -function M.stackDepth(326,9771 -function M.stackDepth(stackDepth326,9771 -function M.setStackDepth(334,9956 -function M.setStackDepth(setStackDepth334,9956 -function M.set_ref_count(338,10028 -function M.set_ref_count(set_ref_count338,10028 -function M.set_depends_on_anyA(342,10099 -function M.set_depends_on_anyA(set_depends_on_anyA342,10099 -function M.get_depends_on_anyA(346,10202 -function M.get_depends_on_anyA(get_depends_on_anyA346,10202 -function M.ref_count(353,10338 -function M.ref_count(ref_count353,10338 -function M.fullName(360,10454 -function M.fullName(fullName360,10454 -function M.find_exact_match(429,13183 -function M.find_exact_match(find_exact_match429,13183 -function M.find_exact_match_meta_module(464,14268 -function M.find_exact_match_meta_module(find_exact_match_meta_module464,14268 -local function l_find_highest_by_key(494,15204 -function M.find_highest(539,16567 -function M.find_highest(find_highest539,16567 -function M.find_latest(543,16659 -function M.find_latest(find_latest543,16659 -function M.find_between(547,16749 -function M.find_between(find_between547,16749 -function M.find_inherit_match(594,18121 -function M.find_inherit_match(find_inherit_match594,18121 -local function l_rangeCk(598,18196 -function M.isloaded(628,19381 -function M.isloaded(isloaded628,19381 -function M.isPending(660,20328 -function M.isPending(isPending660,20328 -function M.defaultKind(673,20677 -function M.defaultKind(defaultKind673,20677 -function M.prereq(688,20980 -function M.prereq(prereq688,20980 -function M.conflictCk(722,21881 -function M.conflictCk(conflictCk722,21881 -function M.downstreamConflictCk(748,22696 -function M.downstreamConflictCk(downstreamConflictCk748,22696 -function M.set_depends_on_flag(772,23407 -function M.set_depends_on_flag(set_depends_on_flag772,23407 -function M.get_depends_on_flag(783,23662 -function M.get_depends_on_flag(get_depends_on_flag783,23662 -function M.reset(788,23788 -function M.reset(reset788,23788 -function M.actionName(795,23924 -function M.actionName(actionName795,23924 -function M.show(803,24140 -function M.show(show803,24140 -function M.print(807,24207 -function M.print(print807,24207 +function M.valid(277,8973 +function M.valid(valid277,8973 +function M.userName(285,9079 +function M.userName(userName285,9079 +function M.origUserName(289,9136 +function M.origUserName(origUserName289,9136 +function M.sn(293,9201 +function M.sn(sn293,9201 +function M.fn(302,9364 +function M.fn(fn302,9364 +function M.version(311,9527 +function M.version(version311,9527 +function M.wV(318,9639 +function M.wV(wV318,9639 +function M.stackDepth(325,9741 +function M.stackDepth(stackDepth325,9741 +function M.setStackDepth(333,9926 +function M.setStackDepth(setStackDepth333,9926 +function M.set_ref_count(337,9998 +function M.set_ref_count(set_ref_count337,9998 +function M.set_depends_on_anyA(341,10069 +function M.set_depends_on_anyA(set_depends_on_anyA341,10069 +function M.get_depends_on_anyA(345,10172 +function M.get_depends_on_anyA(get_depends_on_anyA345,10172 +function M.ref_count(352,10308 +function M.ref_count(ref_count352,10308 +function M.fullName(359,10424 +function M.fullName(fullName359,10424 +local function l_find_exact_match(420,12763 +function M.find_exact_match(465,14451 +function M.find_exact_match(find_exact_match465,14451 +function M.find_exact_match_meta_module(478,15020 +function M.find_exact_match_meta_module(find_exact_match_meta_module478,15020 +local function l_find_highest_by_key(486,15340 +function M.find_highest(532,16767 +function M.find_highest(find_highest532,16767 +function M.find_latest(536,16859 +function M.find_latest(find_latest536,16859 +function M.find_between(540,16949 +function M.find_between(find_between540,16949 +local function l_rangeCk(587,18321 +function M.isloaded(617,19506 +function M.isloaded(isloaded617,19506 +function M.isPending(649,20453 +function M.isPending(isPending649,20453 +function M.defaultKind(662,20802 +function M.defaultKind(defaultKind662,20802 +function M.prereq(677,21105 +function M.prereq(prereq677,21105 +function M.conflictCk(711,22006 +function M.conflictCk(conflictCk711,22006 +function M.downstreamConflictCk(737,22821 +function M.downstreamConflictCk(downstreamConflictCk737,22821 +function M.set_depends_on_flag(761,23532 +function M.set_depends_on_flag(set_depends_on_flag761,23532 +function M.get_depends_on_flag(772,23787 +function M.get_depends_on_flag(get_depends_on_flag772,23787 +function M.reset(777,23913 +function M.reset(reset777,23913 +function M.actionName(784,24049 +function M.actionName(actionName784,24049 +function M.show(792,24265 +function M.show(show792,24265 +function M.print(796,24332 +function M.print(print796,24332 src/MC_CheckSyntax.lua,162 function M.add_property(107,4627 @@ -1265,35 +1264,35 @@ function prereq_any(551,16873 function conflict(561,17254 function atleast(574,17690 function atmost(588,18079 -function between(603,18501 -function latest(615,18855 -function set_alias(628,19140 -function unset_alias(638,19451 -function set_shell_function(648,19789 -function unset_shell_function(658,20144 -function add_property(670,20532 -function remove_property(679,20853 -function hierarchyA(691,21292 -function moduleStackTraceBack(737,22326 -function requireFullName(762,22981 -function LmodErrorExit(771,23281 -function LmodSystemError(778,23462 -function try_load(787,23893 -function unload_usr_internal(796,24139 -function unload_internal(810,24538 -function unload(828,25140 -function always_load(838,25492 -function always_unload(853,25915 -function depends_on(860,26073 -function depends_on_any(868,26316 -function extensions(876,26579 -function color_banner(884,26795 -function source_sh(889,26857 -function complete(896,27055 -function uncomplete(903,27322 -function LmodBreak(910,27577 -function purge(917,27771 -function subprocess(927,27917 +function between(603,18500 +function latest(615,18854 +function set_alias(628,19139 +function unset_alias(638,19450 +function set_shell_function(648,19788 +function unset_shell_function(658,20143 +function add_property(670,20531 +function remove_property(679,20852 +function hierarchyA(691,21291 +function moduleStackTraceBack(737,22325 +function requireFullName(762,22980 +function LmodErrorExit(771,23280 +function LmodSystemError(778,23461 +function try_load(787,23892 +function unload_usr_internal(796,24138 +function unload_internal(810,24537 +function unload(828,25139 +function always_load(838,25491 +function always_unload(853,25914 +function depends_on(860,26072 +function depends_on_any(868,26315 +function extensions(876,26578 +function color_banner(884,26794 +function source_sh(889,26856 +function complete(896,27054 +function uncomplete(903,27321 +function LmodBreak(910,27576 +function purge(917,27770 +function subprocess(927,27916 src/loadModuleFile.lua,33 function loadModuleFile(60,2548 @@ -1397,11 +1396,13 @@ function Usage(139,4804 function version(235,9425 function main(244,9771 -src/mrc_funcs.lua,129 -function module_version(42,1900 -function module_alias(49,2119 -function hide_version(54,2261 -function hide_modulefile(60,2389 +src/mrc_funcs.lua,197 +local function l_validateStringArgs(43,1964 +function module_version(56,2312 +function module_alias(64,2618 +function hide_version(70,2842 +function hide_modulefile(77,3043 +function hide(82,3211 src/utils.lua,2010 function argsPack(76,2914 @@ -1429,39 +1430,39 @@ function paired2pathT(544,16327 function path2pathA(585,17466 function quiet(629,18488 function regular_cmp(636,18627 -function sanizatizeTbl(644,18684 -function setenv_lmod_version(679,19617 -function ShowCmdA(706,20385 -local function l_arg2str(722,20774 -function s_indent(744,21301 -function ShowCmdStr(752,21597 -function ShowHelpStr(804,22799 -function UUIDString(826,23383 -function case_independent_cmp(854,24227 -function activateWarning(871,24723 -function deactivateWarning(877,24895 -function haveWarnings(883,25073 -function setStatusFlag(889,25232 -function getStatusFlag(896,25421 -local function l_restoreEnv(900,25470 -local function l_runTCLprog(928,26032 -local function l_build_runTCLprog(948,26735 -function usingFastTCLInterp(962,27084 -local function l_build_accept_function(968,27321 -local function l_build_allow_dups_function(982,27618 -local function l_build_epoch_function(995,27908 -local function l_build_prepend_order_function(1030,28872 -function setSyntaxMode(1052,29395 -function checkSyntaxMode(1055,29458 -local function l_build_quarantineT(1061,29542 -function save_set_env(1074,29880 -function reset_env(1084,30098 -function initialize_lmod(1099,30427 -function tracing_msg(1164,32757 -function dynamic_shell(1178,33130 -function locatePkg(1227,34510 -function wrap_complete(1239,34743 -function unwrap_complete(1242,34813 +function sanizatizeTbl(640,18680 +function setenv_lmod_version(675,19613 +function ShowCmdA(702,20381 +local function l_arg2str(718,20770 +function s_indent(740,21297 +function ShowCmdStr(748,21593 +function ShowHelpStr(800,22795 +function UUIDString(822,23379 +function case_independent_cmp(850,24223 +function activateWarning(867,24719 +function deactivateWarning(873,24891 +function haveWarnings(879,25069 +function setStatusFlag(885,25228 +function getStatusFlag(892,25417 +local function l_restoreEnv(896,25466 +local function l_runTCLprog(924,26028 +local function l_build_runTCLprog(944,26731 +function usingFastTCLInterp(958,27080 +local function l_build_accept_function(964,27317 +local function l_build_allow_dups_function(978,27614 +local function l_build_epoch_function(991,27904 +local function l_build_prepend_order_function(1026,28868 +function setSyntaxMode(1048,29391 +function checkSyntaxMode(1051,29454 +local function l_build_quarantineT(1057,29538 +function save_set_env(1070,29876 +function reset_env(1080,30094 +function initialize_lmod(1095,30423 +function tracing_msg(1160,32753 +function dynamic_shell(1174,33126 +function locatePkg(1223,34506 +function wrap_complete(1235,34739 +function unwrap_complete(1238,34809 src/cmdfuncs.lua,1144 local function l_Access(76,3264 diff --git a/TAGS.world b/TAGS.world index cb4351fa5..6de425e43 100644 --- a/TAGS.world +++ b/TAGS.world @@ -535,19 +535,19 @@ function M.prereq(69,2440 function M.prereq(prereq69,2440 src/DirTree.lua,468 -local function l_keepFile(78,2584 -local function l_checkValidModulefileReal(100,3093 -local function l_checkValidModulefileFake(112,3306 -local function l_walk_link(121,3583 -local function l_versionFile(142,4205 -local function l_walk(164,4914 -local function l_find_default(233,7727 -local function l_walk_tree(243,7889 -local function l_build(272,8767 -function M.new(294,9417 -function M.new(new294,9417 -function M.dirA(302,9560 -function M.dirA(dirA302,9560 +local function l_keepFile(78,2588 +local function l_checkValidModulefileReal(100,3100 +local function l_checkValidModulefileFake(112,3313 +local function l_walk_link(121,3590 +local function l_versionFile(142,4212 +local function l_walk(164,4921 +local function l_find_default(233,7738 +local function l_walk_tree(243,7900 +local function l_build(272,8778 +function M.new(294,9428 +function M.new(new294,9428 +function M.dirA(302,9571 +function M.dirA(dirA302,9571 src/clearLMOD_cmd.in.lua,290 function optionTbl(96,3118 @@ -1007,8 +1007,8 @@ function parseVersionParts(128,5315 function()(134,5466 src/MN_Match.lua,58 -function M.steps(48,1888 -function M.steps(steps48,1888 +function M.steps(48,1992 +function M.steps(steps48,1992 src/pager.lua,86 function bypassPager(60,2474 @@ -1043,7 +1043,7 @@ function M.date(date19,403 function M.name(20,458 function M.name(name20,458 -src/MRC.lua,1745 +src/MRC.lua,1750 local function l_new(77,2888 function M.singleton(110,4066 function M.singleton(singleton110,4066 @@ -1054,40 +1054,40 @@ local function l_save_su_weights(140,4685 local function l_su_weight_helper(148,4850 function M.parseModA(163,5202 function M.parseModA(parseModA163,5202 -function l_buildMod2VersionT(211,7106 -local function l_find_alias_value(280,8766 -function M.resolve(297,9173 -function M.resolve(resolve297,9173 -function M.getMod2VersionT(323,9917 -function M.getMod2VersionT(getMod2VersionT323,9917 -function M.getFull2AliasesT(330,10096 -function M.getFull2AliasesT(getFull2AliasesT330,10096 -function M.getAlias2ModT(337,10278 -function M.getAlias2ModT(getAlias2ModT337,10278 -local function l_store_mpathT(344,10453 -function M.parseModA_for_moduleA(355,10745 -function M.parseModA_for_moduleA(parseModA_for_moduleA355,10745 -function M.fullNameDfltT(408,12829 -function M.fullNameDfltT(fullNameDfltT408,12829 -function M.mrcMpathT(412,12896 -function M.mrcMpathT(mrcMpathT412,12896 -function M.extract(416,12952 -function M.extract(extract416,12952 -function M.export(423,13159 -function M.export(export423,13159 -local function l_getHiddenT(432,13455 -local function l_import_helper(459,14093 -function M.import(471,14369 -function M.import(import471,14369 -function M.isVisible(488,14880 -function M.isVisible(isVisible488,14880 -function M.update(514,15576 -function M.update(update514,15576 -function l_find_all_su_defaults(521,15724 -function M.find_wght_for_fullName(535,16086 -function M.find_wght_for_fullName(find_wght_for_fullName535,16086 -function M.applyWeights(589,17345 -function M.applyWeights(applyWeights589,17345 +function l_buildMod2VersionT(211,7136 +local function l_find_alias_value(280,8796 +function M.resolve(297,9203 +function M.resolve(resolve297,9203 +function M.getMod2VersionT(323,9947 +function M.getMod2VersionT(getMod2VersionT323,9947 +function M.getFull2AliasesT(330,10126 +function M.getFull2AliasesT(getFull2AliasesT330,10126 +function M.getAlias2ModT(337,10308 +function M.getAlias2ModT(getAlias2ModT337,10308 +local function l_store_mpathT(344,10483 +function M.parseModA_for_moduleA(355,10775 +function M.parseModA_for_moduleA(parseModA_for_moduleA355,10775 +function M.fullNameDfltT(408,12886 +function M.fullNameDfltT(fullNameDfltT408,12886 +function M.mrcMpathT(412,12953 +function M.mrcMpathT(mrcMpathT412,12953 +function M.extract(416,13009 +function M.extract(extract416,13009 +function M.export(423,13216 +function M.export(export423,13216 +local function l_findHiddenState(432,13512 +local function l_import_helper(470,14508 +function M.import(482,14784 +function M.import(import482,14784 +function M.isVisible(499,15295 +function M.isVisible(isVisible499,15295 +function M.update(528,16177 +function M.update(update528,16177 +function l_find_all_su_defaults(535,16325 +function M.find_wght_for_fullName(549,16687 +function M.find_wght_for_fullName(find_wght_for_fullName549,16687 +function M.applyWeights(603,17946 +function M.applyWeights(applyWeights603,17946 src/ReadLmodRC.lua,428 local function l_buildRC(55,2172 @@ -1187,10 +1187,10 @@ src/chkJson,23 function main(59,1566 src/mrc_sandbox.lua,74 -local function l_mrc_run5_1(79,3472 -local function l_mrc_run5_2(92,4148 +local function l_mrc_run5_1(80,3499 +local function l_mrc_run5_2(93,4175 -src/MName.lua,2965 +src/MName.lua,2907 function M.className(52,2104 function M.className(className52,2104 local function l_lessthan(56,2159 @@ -1201,72 +1201,71 @@ local function l_overRide_sType(158,5205 function M.buildA(167,5525 function M.buildA(buildA167,5525 local function l_lazyEval(183,5869 -function M.valid(278,9003 -function M.valid(valid278,9003 -function M.userName(286,9109 -function M.userName(userName286,9109 -function M.origUserName(290,9166 -function M.origUserName(origUserName290,9166 -function M.sn(294,9231 -function M.sn(sn294,9231 -function M.fn(303,9394 -function M.fn(fn303,9394 -function M.version(312,9557 -function M.version(version312,9557 -function M.wV(319,9669 -function M.wV(wV319,9669 -function M.stackDepth(326,9771 -function M.stackDepth(stackDepth326,9771 -function M.setStackDepth(334,9956 -function M.setStackDepth(setStackDepth334,9956 -function M.set_ref_count(338,10028 -function M.set_ref_count(set_ref_count338,10028 -function M.set_depends_on_anyA(342,10099 -function M.set_depends_on_anyA(set_depends_on_anyA342,10099 -function M.get_depends_on_anyA(346,10202 -function M.get_depends_on_anyA(get_depends_on_anyA346,10202 -function M.ref_count(353,10338 -function M.ref_count(ref_count353,10338 -function M.fullName(360,10454 -function M.fullName(fullName360,10454 -function M.find_exact_match(429,13183 -function M.find_exact_match(find_exact_match429,13183 -function M.find_exact_match_meta_module(464,14268 -function M.find_exact_match_meta_module(find_exact_match_meta_module464,14268 -local function l_find_highest_by_key(494,15204 -function M.find_highest(539,16567 -function M.find_highest(find_highest539,16567 -function M.find_latest(543,16659 -function M.find_latest(find_latest543,16659 -function M.find_between(547,16749 -function M.find_between(find_between547,16749 -function M.find_inherit_match(594,18121 -function M.find_inherit_match(find_inherit_match594,18121 -local function l_rangeCk(598,18196 -function M.isloaded(628,19381 -function M.isloaded(isloaded628,19381 -function M.isPending(660,20328 -function M.isPending(isPending660,20328 -function M.defaultKind(673,20677 -function M.defaultKind(defaultKind673,20677 -function M.prereq(688,20980 -function M.prereq(prereq688,20980 -function M.conflictCk(722,21881 -function M.conflictCk(conflictCk722,21881 -function M.downstreamConflictCk(748,22696 -function M.downstreamConflictCk(downstreamConflictCk748,22696 -function M.set_depends_on_flag(772,23407 -function M.set_depends_on_flag(set_depends_on_flag772,23407 -function M.get_depends_on_flag(783,23662 -function M.get_depends_on_flag(get_depends_on_flag783,23662 -function M.reset(788,23788 -function M.reset(reset788,23788 -function M.actionName(795,23924 -function M.actionName(actionName795,23924 -function M.show(803,24140 -function M.show(show803,24140 -function M.print(807,24207 -function M.print(print807,24207 +function M.valid(277,8973 +function M.valid(valid277,8973 +function M.userName(285,9079 +function M.userName(userName285,9079 +function M.origUserName(289,9136 +function M.origUserName(origUserName289,9136 +function M.sn(293,9201 +function M.sn(sn293,9201 +function M.fn(302,9364 +function M.fn(fn302,9364 +function M.version(311,9527 +function M.version(version311,9527 +function M.wV(318,9639 +function M.wV(wV318,9639 +function M.stackDepth(325,9741 +function M.stackDepth(stackDepth325,9741 +function M.setStackDepth(333,9926 +function M.setStackDepth(setStackDepth333,9926 +function M.set_ref_count(337,9998 +function M.set_ref_count(set_ref_count337,9998 +function M.set_depends_on_anyA(341,10069 +function M.set_depends_on_anyA(set_depends_on_anyA341,10069 +function M.get_depends_on_anyA(345,10172 +function M.get_depends_on_anyA(get_depends_on_anyA345,10172 +function M.ref_count(352,10308 +function M.ref_count(ref_count352,10308 +function M.fullName(359,10424 +function M.fullName(fullName359,10424 +local function l_find_exact_match(420,12763 +function M.find_exact_match(465,14451 +function M.find_exact_match(find_exact_match465,14451 +function M.find_exact_match_meta_module(478,15020 +function M.find_exact_match_meta_module(find_exact_match_meta_module478,15020 +local function l_find_highest_by_key(486,15340 +function M.find_highest(532,16767 +function M.find_highest(find_highest532,16767 +function M.find_latest(536,16859 +function M.find_latest(find_latest536,16859 +function M.find_between(540,16949 +function M.find_between(find_between540,16949 +local function l_rangeCk(587,18321 +function M.isloaded(617,19506 +function M.isloaded(isloaded617,19506 +function M.isPending(649,20453 +function M.isPending(isPending649,20453 +function M.defaultKind(662,20802 +function M.defaultKind(defaultKind662,20802 +function M.prereq(677,21105 +function M.prereq(prereq677,21105 +function M.conflictCk(711,22006 +function M.conflictCk(conflictCk711,22006 +function M.downstreamConflictCk(737,22821 +function M.downstreamConflictCk(downstreamConflictCk737,22821 +function M.set_depends_on_flag(761,23532 +function M.set_depends_on_flag(set_depends_on_flag761,23532 +function M.get_depends_on_flag(772,23787 +function M.get_depends_on_flag(get_depends_on_flag772,23787 +function M.reset(777,23913 +function M.reset(reset777,23913 +function M.actionName(784,24049 +function M.actionName(actionName784,24049 +function M.show(792,24265 +function M.show(show792,24265 +function M.print(796,24332 +function M.print(print796,24332 src/MC_CheckSyntax.lua,162 function M.add_property(107,4627 @@ -1543,35 +1542,35 @@ function prereq_any(551,16873 function conflict(561,17254 function atleast(574,17690 function atmost(588,18079 -function between(603,18501 -function latest(615,18855 -function set_alias(628,19140 -function unset_alias(638,19451 -function set_shell_function(648,19789 -function unset_shell_function(658,20144 -function add_property(670,20532 -function remove_property(679,20853 -function hierarchyA(691,21292 -function moduleStackTraceBack(737,22326 -function requireFullName(762,22981 -function LmodErrorExit(771,23281 -function LmodSystemError(778,23462 -function try_load(787,23893 -function unload_usr_internal(796,24139 -function unload_internal(810,24538 -function unload(828,25140 -function always_load(838,25492 -function always_unload(853,25915 -function depends_on(860,26073 -function depends_on_any(868,26316 -function extensions(876,26579 -function color_banner(884,26795 -function source_sh(889,26857 -function complete(896,27055 -function uncomplete(903,27322 -function LmodBreak(910,27577 -function purge(917,27771 -function subprocess(927,27917 +function between(603,18500 +function latest(615,18854 +function set_alias(628,19139 +function unset_alias(638,19450 +function set_shell_function(648,19788 +function unset_shell_function(658,20143 +function add_property(670,20531 +function remove_property(679,20852 +function hierarchyA(691,21291 +function moduleStackTraceBack(737,22325 +function requireFullName(762,22980 +function LmodErrorExit(771,23280 +function LmodSystemError(778,23461 +function try_load(787,23892 +function unload_usr_internal(796,24138 +function unload_internal(810,24537 +function unload(828,25139 +function always_load(838,25491 +function always_unload(853,25914 +function depends_on(860,26072 +function depends_on_any(868,26315 +function extensions(876,26578 +function color_banner(884,26794 +function source_sh(889,26856 +function complete(896,27054 +function uncomplete(903,27321 +function LmodBreak(910,27576 +function purge(917,27770 +function subprocess(927,27916 src/loadModuleFile.lua,33 function loadModuleFile(60,2548 @@ -1675,11 +1674,13 @@ function Usage(139,4804 function version(235,9425 function main(244,9771 -src/mrc_funcs.lua,129 -function module_version(42,1900 -function module_alias(49,2119 -function hide_version(54,2261 -function hide_modulefile(60,2389 +src/mrc_funcs.lua,197 +local function l_validateStringArgs(43,1964 +function module_version(56,2312 +function module_alias(64,2618 +function hide_version(70,2842 +function hide_modulefile(77,3043 +function hide(82,3211 src/utils.lua,2010 function argsPack(76,2914 @@ -1707,39 +1708,39 @@ function paired2pathT(544,16327 function path2pathA(585,17466 function quiet(629,18488 function regular_cmp(636,18627 -function sanizatizeTbl(644,18684 -function setenv_lmod_version(679,19617 -function ShowCmdA(706,20385 -local function l_arg2str(722,20774 -function s_indent(744,21301 -function ShowCmdStr(752,21597 -function ShowHelpStr(804,22799 -function UUIDString(826,23383 -function case_independent_cmp(854,24227 -function activateWarning(871,24723 -function deactivateWarning(877,24895 -function haveWarnings(883,25073 -function setStatusFlag(889,25232 -function getStatusFlag(896,25421 -local function l_restoreEnv(900,25470 -local function l_runTCLprog(928,26032 -local function l_build_runTCLprog(948,26735 -function usingFastTCLInterp(962,27084 -local function l_build_accept_function(968,27321 -local function l_build_allow_dups_function(982,27618 -local function l_build_epoch_function(995,27908 -local function l_build_prepend_order_function(1030,28872 -function setSyntaxMode(1052,29395 -function checkSyntaxMode(1055,29458 -local function l_build_quarantineT(1061,29542 -function save_set_env(1074,29880 -function reset_env(1084,30098 -function initialize_lmod(1099,30427 -function tracing_msg(1164,32757 -function dynamic_shell(1178,33130 -function locatePkg(1227,34510 -function wrap_complete(1239,34743 -function unwrap_complete(1242,34813 +function sanizatizeTbl(640,18680 +function setenv_lmod_version(675,19613 +function ShowCmdA(702,20381 +local function l_arg2str(718,20770 +function s_indent(740,21297 +function ShowCmdStr(748,21593 +function ShowHelpStr(800,22795 +function UUIDString(822,23379 +function case_independent_cmp(850,24223 +function activateWarning(867,24719 +function deactivateWarning(873,24891 +function haveWarnings(879,25069 +function setStatusFlag(885,25228 +function getStatusFlag(892,25417 +local function l_restoreEnv(896,25466 +local function l_runTCLprog(924,26028 +local function l_build_runTCLprog(944,26731 +function usingFastTCLInterp(958,27080 +local function l_build_accept_function(964,27317 +local function l_build_allow_dups_function(978,27614 +local function l_build_epoch_function(991,27904 +local function l_build_prepend_order_function(1026,28868 +function setSyntaxMode(1048,29391 +function checkSyntaxMode(1051,29454 +local function l_build_quarantineT(1057,29538 +function save_set_env(1070,29876 +function reset_env(1080,30094 +function initialize_lmod(1095,30423 +function tracing_msg(1160,32753 +function dynamic_shell(1174,33126 +function locatePkg(1223,34506 +function wrap_complete(1235,34739 +function unwrap_complete(1238,34809 src/cmdfuncs.lua,1144 local function l_Access(76,3264 @@ -5190,25 +5191,25 @@ export MODULEPATH;20,891 _ModuleTable_=21,910 export _ModuleTable_;22,1122 mrcT 30,1280 -mrcMpathT 37,1379 -spiderT 44,1486 -mpathMapT 105,3048 -dbT 117,3279 -provideByT 147,3967 -export LOADEDMODULES;153,4142 -__LMOD_REF_COUNT_MODULEPATH=154,4164 -export __LMOD_REF_COUNT_MODULEPATH;155,4242 -MODULEPATH=156,4278 -export MODULEPATH;157,4334 -_LMFILES_=158,4353 -export _LMFILES_;159,4401 -_ModuleTable_=160,4419 -export _ModuleTable_;161,4822 -export MODULEPATH;167,5038 -_ModuleTable_=168,5057 -export _ModuleTable_;169,5460 -dbT 177,5636 -provideByT 207,6324 +mrcMpathT 39,1405 +spiderT 48,1542 +mpathMapT 109,3104 +dbT 121,3335 +provideByT 151,4023 +export LOADEDMODULES;157,4198 +__LMOD_REF_COUNT_MODULEPATH=158,4220 +export __LMOD_REF_COUNT_MODULEPATH;159,4298 +MODULEPATH=160,4334 +export MODULEPATH;161,4390 +_LMFILES_=162,4409 +export _LMFILES_;163,4457 +_ModuleTable_=164,4475 +export _ModuleTable_;165,4878 +export MODULEPATH;171,5094 +_ModuleTable_=172,5113 +export _ModuleTable_;173,5516 +dbT 181,5692 +provideByT 211,6380 rt/dbT/dbT.tdesc,21 local testName 2,15 @@ -7933,129 +7934,129 @@ export MODULEPATH;199,18631 _ModuleTable_=200,18650 export _ModuleTable_;201,19655 mrcT 209,19823 -mrcMpathT 217,19943 -spiderT 251,20886 -mpathMapT 729,35999 -export MODULEPATH;735,36185 -_ModuleTable_=736,36204 -export _ModuleTable_;737,37209 -export __LMOD_REF_COUNT_MODULEPATH;743,37486 -MODULEPATH=744,37522 -export MODULEPATH;745,37597 -_ModuleTable_=746,37616 -export _ModuleTable_;747,38655 -__LMOD_REF_COUNT_MODULEPATH=763,39106 -export __LMOD_REF_COUNT_MODULEPATH;764,39164 -MODULEPATH=765,39200 -export MODULEPATH;766,39239 -unset _LMFILES_;767,39258 -_ModuleTable_=768,39275 -export _ModuleTable_;769,39431 -export MODULEPATH;775,39620 -_ModuleTable_=776,39639 -export _ModuleTable_;777,39795 -export MODULEPATH;783,39998 -_ModuleTable_=784,40017 -export _ModuleTable_;785,40173 -export LOADEDMODULES;791,40365 -MODULEPATH=792,40387 -export MODULEPATH;793,40426 -_LMFILES_=794,40445 -export _LMFILES_;795,40538 -_ModuleTable_=796,40556 -export _ModuleTable_;797,41051 -export MODULEPATH;803,41239 -_ModuleTable_=804,41258 -export _ModuleTable_;805,41753 -export MODULEPATH;811,41942 -_ModuleTable_=812,41961 -export _ModuleTable_;813,42456 -export MODULEPATH;819,42659 -_ModuleTable_=820,42678 -export _ModuleTable_;821,43173 -export MODULEPATH;827,43362 -_ModuleTable_=828,43381 -export _ModuleTable_;829,43876 -export MODULEPATH;835,44079 -_ModuleTable_=836,44098 -export _ModuleTable_;837,44593 -__LMOD_REF_COUNT_MODULEPATH=843,44764 -export __LMOD_REF_COUNT_MODULEPATH;844,44822 -MODULEPATH=845,44858 -export MODULEPATH;846,44897 -unset _LMFILES_;847,44916 -_ModuleTable_=848,44933 -export _ModuleTable_;849,45089 -mrcT 857,45307 -mrcMpathT 862,45374 -spiderT 874,45604 -mpathMapT 1044,50615 -export __LMOD_REF_COUNT_MODULEPATH;1050,50876 -MODULEPATH=1051,50912 -export MODULEPATH;1052,51005 -_ModuleTable_=1053,51024 -export _ModuleTable_;1054,51292 -mrcT 1062,51510 -mrcMpathT 1067,51577 -spiderT 1079,51807 -mpathMapT 1249,56818 -export __LMOD_REF_COUNT_MODULEPATH;1255,57079 -MODULEPATH=1256,57115 -export MODULEPATH;1257,57208 -_ModuleTable_=1258,57227 -export _ModuleTable_;1259,57495 -export __LMOD_REF_COUNT_MODULEPATH;1265,57703 -MODULEPATH=1266,57739 -export MODULEPATH;1267,57778 -_ModuleTable_=1268,57797 -export _ModuleTable_;1269,57953 -export MODULEPATH;1275,58145 -_ModuleTable_=1276,58164 -export _ModuleTable_;1277,58320 -export MODULEPATH;1283,58532 -_ModuleTable_=1284,58551 -export _ModuleTable_;1285,58707 -export MODULEPATH;1291,58921 -_ModuleTable_=1292,58940 -export _ModuleTable_;1293,59096 -export __LMOD_REF_COUNT_MODULEPATH;1299,59309 -MODULEPATH=1300,59345 -export MODULEPATH;1301,59389 -_ModuleTable_=1302,59408 -export _ModuleTable_;1303,59574 -export __LMOD_REF_COUNT_MODULEPATH;1309,59786 -MODULEPATH=1310,59822 -export MODULEPATH;1311,59865 -_ModuleTable_=1312,59884 -export _ModuleTable_;1313,60048 -export __LMOD_REF_COUNT_MODULEPATH;1319,60260 -MODULEPATH=1320,60296 -export MODULEPATH;1321,60339 -_ModuleTable_=1322,60358 -export _ModuleTable_;1323,60522 -export MODULEPATH;1329,60715 -_ModuleTable_=1330,60734 -export _ModuleTable_;1331,60898 -export __LMOD_REF_COUNT_MODULEPATH;1337,61111 -MODULEPATH=1338,61147 -export MODULEPATH;1339,61191 -_ModuleTable_=1340,61210 -export _ModuleTable_;1341,61376 -export LMOD_MODULERC;1347,61592 -LOADEDMODULES=1348,61614 -export LOADEDMODULES;1349,61657 -MODULEPATH=1350,61679 -export MODULEPATH;1351,61723 -_LMFILES_=1352,61742 -export _LMFILES_;1353,61889 -_ModuleTable_=1354,61907 -export _ModuleTable_;1355,62612 -export MODULEPATH;1361,62805 -_ModuleTable_=1362,62824 -export _ModuleTable_;1363,63529 -export MODULEPATH;1369,63723 -_ModuleTable_=1370,63742 -export _ModuleTable_;1371,64447 +mrcMpathT 221,19995 +spiderT 259,20998 +mpathMapT 737,36111 +export MODULEPATH;743,36297 +_ModuleTable_=744,36316 +export _ModuleTable_;745,37321 +export __LMOD_REF_COUNT_MODULEPATH;751,37598 +MODULEPATH=752,37634 +export MODULEPATH;753,37709 +_ModuleTable_=754,37728 +export _ModuleTable_;755,38767 +__LMOD_REF_COUNT_MODULEPATH=771,39218 +export __LMOD_REF_COUNT_MODULEPATH;772,39276 +MODULEPATH=773,39312 +export MODULEPATH;774,39351 +unset _LMFILES_;775,39370 +_ModuleTable_=776,39387 +export _ModuleTable_;777,39543 +export MODULEPATH;783,39732 +_ModuleTable_=784,39751 +export _ModuleTable_;785,39907 +export MODULEPATH;791,40110 +_ModuleTable_=792,40129 +export _ModuleTable_;793,40285 +export LOADEDMODULES;799,40477 +MODULEPATH=800,40499 +export MODULEPATH;801,40538 +_LMFILES_=802,40557 +export _LMFILES_;803,40650 +_ModuleTable_=804,40668 +export _ModuleTable_;805,41163 +export MODULEPATH;811,41351 +_ModuleTable_=812,41370 +export _ModuleTable_;813,41865 +export MODULEPATH;819,42054 +_ModuleTable_=820,42073 +export _ModuleTable_;821,42568 +export MODULEPATH;827,42771 +_ModuleTable_=828,42790 +export _ModuleTable_;829,43285 +export MODULEPATH;835,43474 +_ModuleTable_=836,43493 +export _ModuleTable_;837,43988 +export MODULEPATH;843,44191 +_ModuleTable_=844,44210 +export _ModuleTable_;845,44705 +__LMOD_REF_COUNT_MODULEPATH=851,44876 +export __LMOD_REF_COUNT_MODULEPATH;852,44934 +MODULEPATH=853,44970 +export MODULEPATH;854,45009 +unset _LMFILES_;855,45028 +_ModuleTable_=856,45045 +export _ModuleTable_;857,45201 +mrcT 865,45419 +mrcMpathT 870,45486 +spiderT 882,45716 +mpathMapT 1052,50727 +export __LMOD_REF_COUNT_MODULEPATH;1058,50988 +MODULEPATH=1059,51024 +export MODULEPATH;1060,51117 +_ModuleTable_=1061,51136 +export _ModuleTable_;1062,51404 +mrcT 1070,51622 +mrcMpathT 1075,51689 +spiderT 1087,51919 +mpathMapT 1257,56930 +export __LMOD_REF_COUNT_MODULEPATH;1263,57191 +MODULEPATH=1264,57227 +export MODULEPATH;1265,57320 +_ModuleTable_=1266,57339 +export _ModuleTable_;1267,57607 +export __LMOD_REF_COUNT_MODULEPATH;1273,57815 +MODULEPATH=1274,57851 +export MODULEPATH;1275,57890 +_ModuleTable_=1276,57909 +export _ModuleTable_;1277,58065 +export MODULEPATH;1283,58257 +_ModuleTable_=1284,58276 +export _ModuleTable_;1285,58432 +export MODULEPATH;1291,58644 +_ModuleTable_=1292,58663 +export _ModuleTable_;1293,58819 +export MODULEPATH;1299,59033 +_ModuleTable_=1300,59052 +export _ModuleTable_;1301,59208 +export __LMOD_REF_COUNT_MODULEPATH;1307,59421 +MODULEPATH=1308,59457 +export MODULEPATH;1309,59501 +_ModuleTable_=1310,59520 +export _ModuleTable_;1311,59686 +export __LMOD_REF_COUNT_MODULEPATH;1317,59898 +MODULEPATH=1318,59934 +export MODULEPATH;1319,59977 +_ModuleTable_=1320,59996 +export _ModuleTable_;1321,60160 +export __LMOD_REF_COUNT_MODULEPATH;1327,60372 +MODULEPATH=1328,60408 +export MODULEPATH;1329,60451 +_ModuleTable_=1330,60470 +export _ModuleTable_;1331,60634 +export MODULEPATH;1337,60827 +_ModuleTable_=1338,60846 +export _ModuleTable_;1339,61010 +export __LMOD_REF_COUNT_MODULEPATH;1345,61223 +MODULEPATH=1346,61259 +export MODULEPATH;1347,61303 +_ModuleTable_=1348,61322 +export _ModuleTable_;1349,61488 +export LMOD_MODULERC;1355,61704 +LOADEDMODULES=1356,61726 +export LOADEDMODULES;1357,61769 +MODULEPATH=1358,61791 +export MODULEPATH;1359,61835 +_LMFILES_=1360,61854 +export _LMFILES_;1361,62001 +_ModuleTable_=1362,62019 +export _ModuleTable_;1363,62724 +export MODULEPATH;1369,62917 +_ModuleTable_=1370,62936 +export _ModuleTable_;1371,63641 +export MODULEPATH;1377,63835 +_ModuleTable_=1378,63854 +export _ModuleTable_;1379,64559 rt/modulerc/modulerc.tdesc,21 local testName 2,15 @@ -13624,164 +13625,164 @@ export MODULEPATH;254,16613 _ModuleTable_=255,16632 export _ModuleTable_;256,16786 mrcT 264,16954 -mrcMpathT 276,17163 -spiderT 277,17178 -mpathMapT 470,23191 -dbT 487,23684 -provideByT 642,28401 -export __LMOD_REF_COUNT_MODULEPATH;778,32340 -MODULEPATH=779,32376 -export MODULEPATH;780,32419 -_ModuleTable_=781,32438 -export _ModuleTable_;782,32602 -export MODULEPATH;788,32799 -_ModuleTable_=789,32818 -export _ModuleTable_;790,32982 -export MODULEPATH;796,33176 -_ModuleTable_=797,33195 -export _ModuleTable_;798,33359 -export MODULEPATH;804,33559 -_ModuleTable_=805,33578 -export _ModuleTable_;806,33742 -export MODULEPATH;812,33949 -_ModuleTable_=813,33968 -export _ModuleTable_;814,34132 -export MODULEPATH;830,34610 -_ModuleTable_=831,34629 -export _ModuleTable_;832,34793 -export MODULEPATH;838,34991 -_ModuleTable_=839,35010 -export _ModuleTable_;840,35174 -export MODULEPATH;846,35367 -_ModuleTable_=847,35386 -export _ModuleTable_;848,35550 -export MODULEPATH;854,35743 -_ModuleTable_=855,35762 -export _ModuleTable_;856,35926 -export MODULEPATH;862,36127 -_ModuleTable_=863,36146 -export _ModuleTable_;864,36310 -export MODULEPATH;870,36509 -_ModuleTable_=871,36528 -export _ModuleTable_;872,36692 -export __LMOD_REF_COUNT_MODULEPATH;878,36911 -MODULEPATH=879,36947 -export MODULEPATH;880,36990 -_ModuleTable_=881,37009 -export _ModuleTable_;882,37173 -export MODULEPATH;888,37377 -_ModuleTable_=889,37396 -export _ModuleTable_;890,37560 -mrcT 898,37728 -mrcMpathT 910,37937 -spiderT 911,37952 -mpathMapT 932,38443 -mrcT 940,38604 -mrcMpathT 952,38813 -spiderT 953,38828 -mpathMapT 1021,40686 -export __LMOD_REF_COUNT_MODULEPATH;1027,40892 -MODULEPATH=1028,40928 -export MODULEPATH;1029,40971 -_ModuleTable_=1030,40990 -export _ModuleTable_;1031,41154 -export MODULEPATH;1037,41362 -_ModuleTable_=1038,41381 -export _ModuleTable_;1039,41545 -export MODULEPATH;1045,41747 -_ModuleTable_=1046,41766 -export _ModuleTable_;1047,41930 -export MODULEPATH;1053,42146 -_ModuleTable_=1054,42165 -export _ModuleTable_;1055,42329 -export MODULEPATH;1061,42537 -_ModuleTable_=1062,42556 -export _ModuleTable_;1063,42720 -export MODULEPATH;1069,42920 -_ModuleTable_=1070,42939 -export _ModuleTable_;1071,43103 -export MODULEPATH;1077,43317 -_ModuleTable_=1078,43336 -export _ModuleTable_;1079,43500 -mrcT 1087,43668 -mrcMpathT 1099,43877 -spiderT 1100,43892 -mpathMapT 1139,45321 -export __LMOD_REF_COUNT_MODULEPATH;1145,45567 -MODULEPATH=1146,45603 -export MODULEPATH;1147,45646 -_ModuleTable_=1148,45665 -export _ModuleTable_;1149,45829 -export MODULEPATH;1155,46060 -_ModuleTable_=1156,46079 -export _ModuleTable_;1157,46243 -export MODULEPATH;1163,46462 -_ModuleTable_=1164,46481 -export _ModuleTable_;1165,46645 -export MODULEPATH;1171,46861 -_ModuleTable_=1172,46880 -export _ModuleTable_;1173,47044 -export LOADEDMODULES;1179,47288 -MODULEPATH=1180,47310 -export MODULEPATH;1181,47353 -_LMFILES_=1182,47372 -export _LMFILES_;1183,47458 -_ModuleTable_=1184,47476 -export _ModuleTable_;1185,47974 -export MODULEPATH;1191,48166 -_ModuleTable_=1192,48185 -export _ModuleTable_;1193,48683 -__LMOD_REF_COUNT_MODULEPATH=1199,48855 -export __LMOD_REF_COUNT_MODULEPATH;1200,48916 -MODULEPATH=1201,48952 -export MODULEPATH;1202,48994 -unset _LMFILES_;1203,49013 -_ModuleTable_=1204,49030 -export _ModuleTable_;1205,49192 -mrcT 1213,49359 -mrcMpathT 1225,49568 -spiderT 1226,49583 -mpathMapT 1373,54834 -dbT 1388,55209 -provideByT 1514,59746 -export MODULEPATH;1520,59946 -_ModuleTable_=1521,59965 -export _ModuleTable_;1522,60127 -export MODULEPATH;1528,60333 -_ModuleTable_=1529,60352 -export _ModuleTable_;1530,60514 -export MODULEPATH;1536,60723 -_ModuleTable_=1537,60742 -export _ModuleTable_;1538,60904 -export MODULEPATH;1544,61097 -_ModuleTable_=1545,61116 -export _ModuleTable_;1546,61278 -export __LMOD_REF_COUNT_MODULEPATH;1552,61490 -MODULEPATH=1553,61526 -export MODULEPATH;1554,61568 -_ModuleTable_=1555,61587 -export _ModuleTable_;1556,61749 -export __LMOD_REF_COUNT_MODULEPATH;1562,62003 -MODULEPATH=1563,62039 -export MODULEPATH;1564,62121 -_ModuleTable_=1565,62140 -export _ModuleTable_;1566,62384 -export MODULEPATH;1572,62623 -_ModuleTable_=1573,62642 -export _ModuleTable_;1574,62886 -export MODULEPATH;1580,63125 -_ModuleTable_=1581,63144 -export _ModuleTable_;1582,63388 -export __LMOD_REF_COUNT_MODULEPATH;1588,63599 -MODULEPATH=1589,63635 -export MODULEPATH;1590,63677 -_ModuleTable_=1591,63696 -export _ModuleTable_;1592,63858 -export __LMOD_REF_COUNT_MODULEPATH;1598,64069 -MODULEPATH=1599,64105 -export MODULEPATH;1600,64147 -_ModuleTable_=1601,64166 -export _ModuleTable_;1602,64328 +mrcMpathT 278,17189 +spiderT 279,17204 +mpathMapT 472,23217 +dbT 489,23710 +provideByT 644,28427 +export __LMOD_REF_COUNT_MODULEPATH;780,32366 +MODULEPATH=781,32402 +export MODULEPATH;782,32445 +_ModuleTable_=783,32464 +export _ModuleTable_;784,32628 +export MODULEPATH;790,32825 +_ModuleTable_=791,32844 +export _ModuleTable_;792,33008 +export MODULEPATH;798,33202 +_ModuleTable_=799,33221 +export _ModuleTable_;800,33385 +export MODULEPATH;806,33585 +_ModuleTable_=807,33604 +export _ModuleTable_;808,33768 +export MODULEPATH;814,33975 +_ModuleTable_=815,33994 +export _ModuleTable_;816,34158 +export MODULEPATH;832,34636 +_ModuleTable_=833,34655 +export _ModuleTable_;834,34819 +export MODULEPATH;840,35017 +_ModuleTable_=841,35036 +export _ModuleTable_;842,35200 +export MODULEPATH;848,35393 +_ModuleTable_=849,35412 +export _ModuleTable_;850,35576 +export MODULEPATH;856,35769 +_ModuleTable_=857,35788 +export _ModuleTable_;858,35952 +export MODULEPATH;864,36153 +_ModuleTable_=865,36172 +export _ModuleTable_;866,36336 +export MODULEPATH;872,36535 +_ModuleTable_=873,36554 +export _ModuleTable_;874,36718 +export __LMOD_REF_COUNT_MODULEPATH;880,36937 +MODULEPATH=881,36973 +export MODULEPATH;882,37016 +_ModuleTable_=883,37035 +export _ModuleTable_;884,37199 +export MODULEPATH;890,37403 +_ModuleTable_=891,37422 +export _ModuleTable_;892,37586 +mrcT 900,37754 +mrcMpathT 914,37989 +spiderT 915,38004 +mpathMapT 936,38495 +mrcT 944,38656 +mrcMpathT 958,38891 +spiderT 959,38906 +mpathMapT 1027,40764 +export __LMOD_REF_COUNT_MODULEPATH;1033,40970 +MODULEPATH=1034,41006 +export MODULEPATH;1035,41049 +_ModuleTable_=1036,41068 +export _ModuleTable_;1037,41232 +export MODULEPATH;1043,41440 +_ModuleTable_=1044,41459 +export _ModuleTable_;1045,41623 +export MODULEPATH;1051,41825 +_ModuleTable_=1052,41844 +export _ModuleTable_;1053,42008 +export MODULEPATH;1059,42224 +_ModuleTable_=1060,42243 +export _ModuleTable_;1061,42407 +export MODULEPATH;1067,42615 +_ModuleTable_=1068,42634 +export _ModuleTable_;1069,42798 +export MODULEPATH;1075,42998 +_ModuleTable_=1076,43017 +export _ModuleTable_;1077,43181 +export MODULEPATH;1083,43395 +_ModuleTable_=1084,43414 +export _ModuleTable_;1085,43578 +mrcT 1093,43746 +mrcMpathT 1107,43981 +spiderT 1108,43996 +mpathMapT 1147,45425 +export __LMOD_REF_COUNT_MODULEPATH;1153,45671 +MODULEPATH=1154,45707 +export MODULEPATH;1155,45750 +_ModuleTable_=1156,45769 +export _ModuleTable_;1157,45933 +export MODULEPATH;1163,46164 +_ModuleTable_=1164,46183 +export _ModuleTable_;1165,46347 +export MODULEPATH;1171,46566 +_ModuleTable_=1172,46585 +export _ModuleTable_;1173,46749 +export MODULEPATH;1179,46965 +_ModuleTable_=1180,46984 +export _ModuleTable_;1181,47148 +export LOADEDMODULES;1187,47392 +MODULEPATH=1188,47414 +export MODULEPATH;1189,47457 +_LMFILES_=1190,47476 +export _LMFILES_;1191,47562 +_ModuleTable_=1192,47580 +export _ModuleTable_;1193,48078 +export MODULEPATH;1199,48270 +_ModuleTable_=1200,48289 +export _ModuleTable_;1201,48787 +__LMOD_REF_COUNT_MODULEPATH=1207,48959 +export __LMOD_REF_COUNT_MODULEPATH;1208,49020 +MODULEPATH=1209,49056 +export MODULEPATH;1210,49098 +unset _LMFILES_;1211,49117 +_ModuleTable_=1212,49134 +export _ModuleTable_;1213,49296 +mrcT 1221,49463 +mrcMpathT 1235,49698 +spiderT 1236,49713 +mpathMapT 1383,54964 +dbT 1398,55339 +provideByT 1524,59876 +export MODULEPATH;1530,60076 +_ModuleTable_=1531,60095 +export _ModuleTable_;1532,60257 +export MODULEPATH;1538,60463 +_ModuleTable_=1539,60482 +export _ModuleTable_;1540,60644 +export MODULEPATH;1546,60853 +_ModuleTable_=1547,60872 +export _ModuleTable_;1548,61034 +export MODULEPATH;1554,61227 +_ModuleTable_=1555,61246 +export _ModuleTable_;1556,61408 +export __LMOD_REF_COUNT_MODULEPATH;1562,61620 +MODULEPATH=1563,61656 +export MODULEPATH;1564,61698 +_ModuleTable_=1565,61717 +export _ModuleTable_;1566,61879 +export __LMOD_REF_COUNT_MODULEPATH;1572,62133 +MODULEPATH=1573,62169 +export MODULEPATH;1574,62251 +_ModuleTable_=1575,62270 +export _ModuleTable_;1576,62514 +export MODULEPATH;1582,62753 +_ModuleTable_=1583,62772 +export _ModuleTable_;1584,63016 +export MODULEPATH;1590,63255 +_ModuleTable_=1591,63274 +export _ModuleTable_;1592,63518 +export __LMOD_REF_COUNT_MODULEPATH;1598,63729 +MODULEPATH=1599,63765 +export MODULEPATH;1600,63807 +_ModuleTable_=1601,63826 +export _ModuleTable_;1602,63988 +export __LMOD_REF_COUNT_MODULEPATH;1608,64199 +MODULEPATH=1609,64235 +export MODULEPATH;1610,64277 +_ModuleTable_=1611,64296 +export _ModuleTable_;1612,64458 rt/spider/err.txt,858 The greenlet package is a spin-off of Stackless, a version of CPython that supports micro-threads called "tasklets". Tasklets run pseudo-concurrently (typically in a single or a few OS-level threads) and are synchronized with data exchanges on "channels". A "greenlet", on the other hand, is a still more primitive notion of micro-thread with no implicit scheduling; coroutines,30,1243 @@ -16133,9 +16134,9 @@ Load Storms: Long load times or Fails to Load1,0 docs/source/060_locating.rst,169 How Lmod Picks which Modulefiles to Load3,23 - module_version(173,6077 - $ module purge; module load intel boost;389,13679 - $ module swap intel gcc;411,14252 + module_version(173,6184 + $ module purge; module load intel boost;389,13786 + $ module swap intel gcc;411,14359 docs/source/160_debugging_modulefiles.rst,468 Debugging Modulefiles3,34 diff --git a/messageDir/en.lua b/messageDir/en.lua index cf6ad2e78..87f874679 100644 --- a/messageDir/en.lua +++ b/messageDir/en.lua @@ -102,6 +102,9 @@ return { -------------------------------------------------------------------------- e_Args_Not_Strings = [==[Syntax error in file: %{fn} with command: %{cmdName}, one or more arguments are not strings. +]==], -- + e_Args_Not_Table = [==[Syntax error in file: %{fn} + with function: %{func}, is not a table. ]==], -- e_Args_Not_Strings_short = "command: %{cmdName}, one or more arguments are not strings.", e_Avail_No_MPATH = "module %{name} is not possible. MODULEPATH is not set or not set with valid paths.\n", diff --git a/rt/dbT/err.txt b/rt/dbT/err.txt index c8aa00003..b6041591b 100644 --- a/rt/dbT/err.txt +++ b/rt/dbT/err.txt @@ -2,7 +2,7 @@ step 1 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version =========================== -Modules based on Lua: Version 8.7.40 2024-06-11 15:18 -06:00 +Modules based on Lua: Version 8.7.47 2024-07-22 10:04 -04:00 by Robert McLay mclay@tacc.utexas.edu =========================== step 2 diff --git a/rt/dbT/out.txt b/rt/dbT/out.txt index a15dff1e3..84843e729 100644 --- a/rt/dbT/out.txt +++ b/rt/dbT/out.txt @@ -30,14 +30,18 @@ timestampFn = { mrcT = { alias2modT = {}, hiddenT = { - ["foobar/1.2.3"] = true, + ["foobar/1.2.3"] = { + kind = "hidden", + }, }, version2modT = {}, } mrcMpathT = { ["ProjectDIR/rt/dbT/mf3"] = { hiddenT = { - ["foobar/1.2.3"] = true, + ["foobar/1.2.3"] = { + kind = "hidden", + }, }, }, } diff --git a/rt/modulerc/err.txt b/rt/modulerc/err.txt index a5b67538f..703166a45 100644 --- a/rt/modulerc/err.txt +++ b/rt/modulerc/err.txt @@ -2,7 +2,7 @@ step 1 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version =========================== -Modules based on Lua: Version 8.7.37 2024-03-17 13:11 -06:00 +Modules based on Lua: Version 8.7.47 2024-07-22 10:04 -04:00 by Robert McLay mclay@tacc.utexas.edu =========================== step 2 diff --git a/rt/modulerc/out.txt b/rt/modulerc/out.txt index ca237687d..066a12815 100644 --- a/rt/modulerc/out.txt +++ b/rt/modulerc/out.txt @@ -209,8 +209,12 @@ timestampFn = { mrcT = { alias2modT = {}, hiddenT = { - ["h2/1.0"] = true, - ["hidden/1.0"] = true, + ["h2/1.0"] = { + kind = "hidden", + }, + ["hidden/1.0"] = { + kind = "hidden", + }, }, version2modT = {}, } @@ -221,8 +225,12 @@ mrcMpathT = { z23 = "z/23", }, hiddenT = { - ["h2/1.0"] = true, - ["hidden/1.0"] = true, + ["h2/1.0"] = { + kind = "hidden", + }, + ["hidden/1.0"] = { + kind = "hidden", + }, }, version2modT = { ["a/13"] = "a/13.2.345", diff --git a/rt/spider/err.txt b/rt/spider/err.txt index f55141146..05a886b5a 100644 --- a/rt/spider/err.txt +++ b/rt/spider/err.txt @@ -2,7 +2,7 @@ step 1 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version =========================== -Modules based on Lua: Version 8.7.39 2024-06-02 12:29 -05:00 +Modules based on Lua: Version 8.7.47 2024-07-22 10:04 -04:00 by Robert McLay mclay@tacc.utexas.edu =========================== step 2 diff --git a/rt/spider/out.txt b/rt/spider/out.txt index 6ec81bc8d..c4ec00fc7 100644 --- a/rt/spider/out.txt +++ b/rt/spider/out.txt @@ -266,7 +266,9 @@ mrcT = { intelcompiler = "intel", }, hiddenT = { - ["gcc/4.8"] = true, + ["gcc/4.8"] = { + kind = "hidden", + }, }, version2modT = { ["intel/17"] = "intel/2017.1.132", @@ -900,7 +902,9 @@ mrcT = { intelcompiler = "intel", }, hiddenT = { - ["gcc/4.8"] = true, + ["gcc/4.8"] = { + kind = "hidden", + }, }, version2modT = { ["intel/17"] = "intel/2017.1.132", @@ -942,7 +946,9 @@ mrcT = { intelcompiler = "intel", }, hiddenT = { - ["gcc/4.8"] = true, + ["gcc/4.8"] = { + kind = "hidden", + }, }, version2modT = { ["intel/17"] = "intel/2017.1.132", @@ -1089,7 +1095,9 @@ mrcT = { intelcompiler = "intel", }, hiddenT = { - ["gcc/4.8"] = true, + ["gcc/4.8"] = { + kind = "hidden", + }, }, version2modT = { ["intel/17"] = "intel/2017.1.132", @@ -1215,7 +1223,9 @@ mrcT = { intelcompiler = "intel", }, hiddenT = { - ["gcc/4.8"] = true, + ["gcc/4.8"] = { + kind = "hidden", + }, }, version2modT = { ["intel/17"] = "intel/2017.1.132", diff --git a/src/MN_Match.lua b/src/MN_Match.lua index 010695119..72a1fd454 100644 --- a/src/MN_Match.lua +++ b/src/MN_Match.lua @@ -40,9 +40,9 @@ M.my_name = "match" local s_stepA = { - MName.find_exact_match, - MName.find_highest, - MName.find_exact_match_meta_module, + MName.find_exact_match, -- exact match with required version + MName.find_highest, -- Highest match + MName.find_exact_match_meta_module, -- match meta module } function M.steps() diff --git a/src/MName.lua b/src/MName.lua index b2c334ae0..24cc6d405 100644 --- a/src/MName.lua +++ b/src/MName.lua @@ -417,25 +417,16 @@ end -- the whole module tree is treated as NVV. ------------------------------------------------------------------------- --- M.find_exact_match() is more difficult because there are possibly --- more than one marked default: --- 1) The filesystem can mark a default (weighted by '^') --- 2) The system admins can have a modulerc file. (weighted by 's') --- 3) The user can have a ~/.modulerc file. (weighted by 'u') - - -function M.find_exact_match(self, fileA) - --dbg.start{"MName:find_exact_match(fileA)"} +local function l_find_exact_match(self, must_have_version, fileA) + dbg.start{"MName l_find_exact_match(must_have_version:,",must_have_version,",fileA)"} local versionStr = self.__versionStr + local mrc = MRC:singleton() local fn = false local version = false local pV = " " -- this is less than the lowest possible weight local wV = false local found = false - if (not versionStr) then - --dbg.print{"found: ",found,", fn: ",fn,", version: ", version,"\n"} - --dbg.fini("MName:find_exact_match") + if (must_have_version and not versionStr) then return found, fn, version end @@ -443,55 +434,57 @@ function M.find_exact_match(self, fileA) local blockA = fileA[j] for i = 1, #blockA do local entry = blockA[i] - if (entry.version == versionStr and entry.pV > pV ) then - pV = entry.pV - wV = entry.wV - fn = entry.fn - version = entry.version or false - found = true - self.__range = { pV, pV } - break + if (mrc:isVisible{fullName=entry.fullName,sn=entry.sn,fn=entry.fn, + visibleT = {soft = true, hidden = true}}) then + if (entry.version == versionStr and entry.pV > pV ) then + pV = entry.pV + wV = entry.wV + fn = entry.fn + version = entry.version or false + found = true + self.__range = { pV, pV } + break + end end end end - --dbg.print{"found: ",found,", fn: ",fn,", version: ", version,"\n"} - --dbg.fini("MName:find_exact_match") + dbg.print{"found: ",found,", fn: ",fn,", version: ", version,", wV: ",wV,"\n"} + dbg.fini("MName l_find_exact_match") return found, fn, version, wV end + -function M.find_exact_match_meta_module(self, fileA) - --dbg.start{"MName:find_exact_match_meta_module(fileA)"} - local versionStr = self.__versionStr - local fn = false - local version = false - local pV = " " -- this is less than the lowest possible weight - local wV = false - local found = false - for j = 1, #fileA do - local blockA = fileA[j] - for i = 1, #blockA do - local entry = blockA[i] - if (entry.version == versionStr and entry.pV > pV ) then - pV = entry.pV - wV = entry.wV - fn = entry.fn - version = entry.version or false - found = true - self.__range = { pV, pV } - break - end - end - end +------------------------------------------------------------------------ +-- M.find_exact_match() is more difficult because there are possibly +-- more than one marked default: +-- 1) The filesystem can mark a default (weighted by '^') +-- 2) The system admins can have a modulerc file. (weighted by 's') +-- 3) The user can have a ~/.modulerc file. (weighted by 'u') - --dbg.print{"found: ",found,", fn: ",fn,", version: ", version,"\n"} - --dbg.fini("MName:find_exact_match_meta_module") +function M.find_exact_match(self, fileA) + dbg.start{"MName:find_exact_match(fileA)"} + local must_have_version = true + local found, fn, version, wV = l_find_exact_match(self, must_have_version, fileA) + dbg.fini("MName:find_exact_match") return found, fn, version, wV end +------------------------------------------------------------------------ +-- This routine is almost the same as M.find_exact_match +-- But this routine is here to find moduleName w/o versions +-- (namely meta modules). But modules with version have a +-- higher priority over meta modules. +function M.find_exact_match_meta_module(self, fileA) + dbg.start{"MName:find_exact_match_meta_module(fileA)"} + local must_have_version = false + local found, fn, version, wV = l_find_exact_match(self, must_have_version, fileA) + dbg.fini("MName:find_exact_match_meta_module") + return found, fn, version, wV +end local function l_find_highest_by_key(self, key, fileA) - --dbg.start{"MName: l_find_highest_by_key(key:\"",key,"\",fileA)"} + dbg.start{"MName: l_find_highest_by_key(key:\"",key,"\",fileA)"} local mrc = MRC:singleton() local weight = " " -- this is less than the lower possible weight. local idx = nil @@ -509,7 +502,8 @@ local function l_find_highest_by_key(self, key, fileA) for i = 1,#blockA do local entry = blockA[i] local v = entry[key] - if (mrc:isVisible{fullName=entry.fullName,sn=entry.sn,fn=entry.fn} or isMarked(v)) then + if (isMarked(v) or mrc:isVisible{fullName=entry.fullName,sn=entry.sn,fn=entry.fn, + visibleT = {soft = true}}) then if (v > weight) then idx = i weight = v @@ -526,8 +520,8 @@ local function l_find_highest_by_key(self, key, fileA) found = true self.__range = { pV, pV } end - --dbg.print{"found: ",found,", fn: ",fn,", version: ", version,", wV: ",wV,"\n"} - --dbg.fini("MName: l_find_highest_by_key") + dbg.print{"found: ",found,", fn: ",fn,", version: ", version,", wV: ",wV,"\n"} + dbg.fini("MName: l_find_highest_by_key") return found, fn, version, wV end @@ -590,10 +584,6 @@ function M.find_between(self, fileA) return found, fn, version, wV end -function M.find_inherit_match(self,fileA) - local a = fileA[1] or {} -end - local function l_rangeCk(self, version, result_if_found, result_if_not_found) --dbg.start{"l_rangeCk(self, version: ",version,", result_if_found: ",result_if_found,", result_if_not_found: ",result_if_not_found,")"} local have_range = false diff --git a/src/MRC.lua b/src/MRC.lua index 0a846c113..46744181f 100644 --- a/src/MRC.lua +++ b/src/MRC.lua @@ -168,7 +168,7 @@ function M.parseModA(self, modA, weight) local entry = modA[i] --dbg.print{"entry.kind: ",entry.kind, "\n"} - if (entry.kind == "module_version") then + if (entry.action == "module_version") then local fullName = entry.module_name fullName = self:resolve({}, fullName) --dbg.print{"self:resolve({}, fullName): ",fullName, "\n"} @@ -193,15 +193,15 @@ function M.parseModA(self, modA, weight) --dbg.print{"v2m: key: ",key,": ",fullName,"\n"} end end - elseif (entry.kind == "module_alias") then + elseif (entry.action == "module_alias") then --dbg.print{"name: ",entry.name,", mfile: ", entry.mfile,"\n"} self.__alias2modT[entry.name] = entry.mfile - elseif (entry.kind == "hide_version") then + elseif (entry.action == "hide_version") then --dbg.print{"mfile: ", entry.mfile,"\n"} - self.__hiddenT[entry.mfile] = true - elseif (entry.kind == "hide_modulefile") then + self.__hiddenT[entry.mfile] = {kind="hidden"} + elseif (entry.action == "hide_modulefile") then --dbg.print{"mfile: ", entry.mfile,"\n"} - self.__hiddenT[entry.mfile] = true + self.__hiddenT[entry.mfile] = {kind="hidden"} end until true end @@ -357,9 +357,9 @@ function M.parseModA_for_moduleA(self, name, mpath, modA) local defaultV = false for i = 1,#modA do local entry = modA[i] - --dbg.print{"entry.kind: ",entry.kind, "\n"} + --dbg.print{"entry.action: ",entry.action, "\n"} - if (entry.kind == "module_version") then + if (entry.action == "module_version") then local fullName = entry.module_name if (fullName:sub(1,1) == '/') then fullName = name .. fullName @@ -384,10 +384,10 @@ function M.parseModA_for_moduleA(self, name, mpath, modA) end end end - elseif (entry.kind == "set_default_version") then + elseif (entry.action == "set_default_version") then --dbg.print{"version: ",entry.version,"\n"} defaultV = entry.version - elseif (entry.kind == "module_alias") then + elseif (entry.action == "module_alias") then local fullName = entry.name if (fullName:sub(1,1) == '/') then fullName = name .. fullName @@ -395,9 +395,9 @@ function M.parseModA_for_moduleA(self, name, mpath, modA) local mfile = entry.mfile --dbg.print{"fullName: ",fullName,", mfile: ", mfile,"\n"} l_store_mpathT(self, mpath, "alias2modT", fullName, mfile); - elseif (entry.kind == "hide_version" or entry.kind == "hide_modulefile") then + elseif (entry.action == "hide_version" or entry.action == "hide_modulefile") then --dbg.print{"mfile: ", entry.mfile,"\n"} - l_store_mpathT(self, mpath, "hiddenT", entry.mfile, true); + l_store_mpathT(self, mpath, "hiddenT", entry.mfile, {kind = "hidden"}); end end --dbg.fini("MRC:parseModA_for_moduleA") @@ -429,31 +429,42 @@ function M.export(self) end local s_must_convert = true -local function l_getHiddenT(self, mpathA, k) +local function l_findHiddenState(self, mpathA, sn, fullName, fn) local t = {} if (s_must_convert) then s_must_convert = false local hT + local replaceT = {kind = "hidden"} for i = #mpathA, 1, -1 do local mpath = mpathA[i] if (self.__mpathT[mpath]) then hT = self.__mpathT[mpath].hiddenT if (hT) then - for key in pairs(hT) do - t[self:resolve(mpathA, key)] = true + for k,v in pairs(hT) do + t[self:resolve(mpathA, k)] = (v ~= true) and v or replaceT end end end end hT = self.__hiddenT - for key in pairs(hT) do - t[self:resolve(mpathA, key)] = true + for k, v in pairs(hT) do + t[self:resolve(mpathA, k)] = (v ~= true) and v or replaceT end self.__hiddenT = t end - return self.__hiddenT[k] + t = self.__hiddenT + local resultT = t[sn] or t[fullName] or t[fn] + if (not resultT) then + local _ + local n = fullName + while (n and n ~= sn and not resultT) do + _, _, n = n:find("(.*)/.*") + resultT = t[n] + end + end + return resultT end local function l_import_helper(self,entryT) @@ -490,17 +501,20 @@ function M.isVisible(self, modT) local mname = frameStk:mname() local mt = frameStk:mt() local mpathA = modT.mpathA or mt:modulePathA() - local name = modT.fullName + local fullName = modT.fullName local fn = modT.fn + local sn = modT.sn local isVisible = true + local visibleT = modT.visibleT or {} - if (l_getHiddenT(self, mpathA, name) or l_getHiddenT(self, mpathA, fn)) then - isVisible = false - elseif (name:sub(1,1) == ".") then - isVisible = false + local resultT = l_findHiddenState(self, mpathA, sn, fullName, fn) + if (type(resultT) == "table" ) then + isVisible = (visibleT[resultT.kind] ~= nil) + elseif (fullName:sub(1,1) == ".") then + isVisible = (visibleT.hidden == true) else - local idx = name:find("/%.") - isVisible = idx == nil + local idx = fullName:find("/%.") + isVisible = (idx == nil) or (visibleT.hidden == true) end modT.isVisible = isVisible diff --git a/src/RC2lua.tcl b/src/RC2lua.tcl index 54da1bb4b..fcb671555 100755 --- a/src/RC2lua.tcl +++ b/src/RC2lua.tcl @@ -50,15 +50,15 @@ proc doubleQuoteEscaped {text} { } proc module-alias {name mfile} { - myPuts "\{kind=\"module_alias\",name=\"$name\",mfile=\"$mfile\"\}," + myPuts "\{action=\"module_alias\",name=\"$name\",mfile=\"$mfile\"\}," } proc hide-version {mfile} { - myPuts "\{kind=\"hide_version\", mfile=\"$mfile\"\}," + myPuts "\{action=\"hide_version\", mfile=\"$mfile\"\}," } proc hide-modulefile {mfile} { - myPuts "\{kind=\"hide_modulefile\", mfile=\"$mfile\"\}," + myPuts "\{action=\"hide_modulefile\", mfile=\"$mfile\"\}," } @@ -76,7 +76,7 @@ proc module-version {args} { lappend argL "\"$val\"" } set versionA [join $argL ","] - myPuts "\{kind=\"module_version\",module_name=\"$module_name\", module_versionA=\{$versionA\}\}," + myPuts "\{action=\"module_version\",module_name=\"$module_name\", module_versionA=\{$versionA\}\}," } proc showResults {} { @@ -120,7 +120,7 @@ proc main {mRcFile} { } if { $found > 0 } { - myPuts "\{kind=\"set_default_version\", version=\"$version\"\}," + myPuts "\{action=\"set_default_version\", version=\"$version\"\}," } myPuts "\}" showResults diff --git a/src/mrc_funcs.lua b/src/mrc_funcs.lua index 1b33ba8ec..08d314fe3 100644 --- a/src/mrc_funcs.lua +++ b/src/mrc_funcs.lua @@ -37,27 +37,52 @@ require("strict") -- THE SOFTWARE. -- -------------------------------------------------------------------------- +require("utils") +local pack = (_VERSION == "Lua 5.1") and argsPack or table.pack -- luacheck: compat + +local function l_validateStringArgs(cmdName, ...) + local argA = pack(...) + for i = 1, argA.n do + local v = argA[i] + if (type(v) ~= "string") then + mcp:report{msg="e_Args_Not_Strings", fn = myMRC_file(), cmdName = cmdName} + return false + end + end + return true +end --module_version("module_name","v1","v2"...) function module_version(module_name, ...) + if (not l_validateStringArgs("module_version", module_name, ...)) then return end local argA = pack(...) argA.n = nil - ModA[#ModA+1] = {kind="module_version", module_name=module_name, module_versionA=argA} + ModA[#ModA+1] = {action="module_version", module_name=module_name, module_versionA=argA} end --module_alias("name","modulefile") function module_alias(name,mfile) - ModA[#ModA+1] = {kind="module_alias", name=name, mfile=mfile} + if (not l_validateStringArgs("module_version", name, mfile)) then return end + ModA[#ModA+1] = {action="module_alias", name=name, mfile=mfile} end --hide_version("full_module_version") function hide_version(full) - ModA[#ModA+1] = {kind="hide_version", mfile=full} + if (not l_validateStringArgs("hide_version", full)) then return end + ModA[#ModA+1] = {action="hide_version", mfile=full} end --hide_modulefile("/path/to/modulefile") function hide_modulefile(path) - ModA[#ModA+1] = {kind="hide_modulefile", mfile=path} + if (not l_validateStringArgs("hide_modulefile", path)) then return end + ModA[#ModA+1] = {action="hide_modulefile", mfile=path} end +function hide(t) + if (type(t) ~= "table") then + mpc:report{msg="e_Args_Not_Table",func="hide",fn=myMRC_file()} + end + t.action = "hide" + ModA[#ModA+1] = t +end diff --git a/src/mrc_sandbox.lua b/src/mrc_sandbox.lua index 7dac39301..091638818 100644 --- a/src/mrc_sandbox.lua +++ b/src/mrc_sandbox.lua @@ -56,6 +56,7 @@ local mrc_sandbox_env = { require = require, module_alias = module_alias, module_version = module_version, + hide = hide, hide_version = hide_version, hide_modulefile = hide_modulefile, os = { clock = os.clock, difftime = os.difftime, time = os.time, date = os.date, diff --git a/src/utils.lua b/src/utils.lua index 93964e0d0..9b2ecf3c8 100644 --- a/src/utils.lua +++ b/src/utils.lua @@ -637,10 +637,6 @@ function regular_cmp(x,y) return x.pV < y.pV end - - - - function sanizatizeTbl(rplmntA, inT, outT) for k, v in pairs(inT) do local key = k From a0a2948bb94844867db1a06c9fbb9128b858cbfb Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Sat, 10 Aug 2024 14:21:49 -0600 Subject: [PATCH 075/198] Issue #690: added hidden module support for load(between()) --- rt/between/between.tdesc | 2 ++ rt/between/err.txt | 12 +++++++++++- rt/between/mf/Core/Me.lua | 3 +++ rt/between/mf/Core/d/.modulerc.lua | 1 + rt/between/mf/Core/d/1.0.lua | 0 rt/between/mf/Core/d/1.1.lua | 0 rt/between/mf/Core/d/1.2.lua | 0 rt/between/mf/Core/d/1.3.lua | 0 rt/between/mf/Core/d/1.4.lua | 0 rt/between/mf/Core/d/1.5.lua | 0 rt/between/mf/Core/e/.modulerc.lua | 2 ++ rt/between/mf/Core/e/1.0.lua | 0 rt/between/mf/Core/e/1.1.lua | 0 rt/between/mf/Core/e/1.2.lua | 0 rt/between/mf/Core/e/1.3.lua | 0 rt/between/mf/Core/e/1.4.lua | 0 rt/between/mf/Core/e/1.5.lua | 0 rt/between/out.txt | 20 ++++++++++++++++++++ src/MName.lua | 18 +++++++----------- 19 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 rt/between/mf/Core/Me.lua create mode 100644 rt/between/mf/Core/d/.modulerc.lua create mode 100644 rt/between/mf/Core/d/1.0.lua create mode 100644 rt/between/mf/Core/d/1.1.lua create mode 100644 rt/between/mf/Core/d/1.2.lua create mode 100644 rt/between/mf/Core/d/1.3.lua create mode 100644 rt/between/mf/Core/d/1.4.lua create mode 100644 rt/between/mf/Core/d/1.5.lua create mode 100644 rt/between/mf/Core/e/.modulerc.lua create mode 100644 rt/between/mf/Core/e/1.0.lua create mode 100644 rt/between/mf/Core/e/1.1.lua create mode 100644 rt/between/mf/Core/e/1.2.lua create mode 100644 rt/between/mf/Core/e/1.3.lua create mode 100644 rt/between/mf/Core/e/1.4.lua create mode 100644 rt/between/mf/Core/e/1.5.lua diff --git a/rt/between/between.tdesc b/rt/between/between.tdesc index 3f3326e75..fc69f29f7 100644 --- a/rt/between/between.tdesc +++ b/rt/between/between.tdesc @@ -49,6 +49,8 @@ testdescript = { runLmod load a/1.1 Mb #23 runLmod load Mc #24 runLmod load Md #25 + runLmod load Me #26 + runLmod list #27 HOME=$ORIG_HOME cat _stdout.[0-9][0-9][0-9] > _stdout.orig diff --git a/rt/between/err.txt b/rt/between/err.txt index 5f70bf284..b307759bd 100644 --- a/rt/between/err.txt +++ b/rt/between/err.txt @@ -2,7 +2,7 @@ step 1 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version =========================== -Modules based on Lua: Version 8.6.9 2022-02-02 11:25 -04:00 +Modules based on Lua: Version 8.7.47 2024-07-22 10:04 -04:00 by Robert McLay mclay@tacc.utexas.edu =========================== step 2 @@ -163,3 +163,13 @@ Lmod has detected the following error: These module(s) or extension(s) exist but Executing this command requires loading "a" which failed while processing the following module(s): Module fullname Module Filename Md ProjectDIR/rt/between/mf/Core/Md.lua +=========================== +step 26 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load Me +=========================== +=========================== +step 27 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing list +=========================== +Currently Loaded Modules: + 1) b/1.4 2) M9 3) a/1.1 4) Mb 5) d/1.3 6) e/1.2 7) Me diff --git a/rt/between/mf/Core/Me.lua b/rt/between/mf/Core/Me.lua new file mode 100644 index 000000000..9e27462d8 --- /dev/null +++ b/rt/between/mf/Core/Me.lua @@ -0,0 +1,3 @@ +load(between("d","1.1<","<1.5")) +load(between("e","1.1<","1.5")) + diff --git a/rt/between/mf/Core/d/.modulerc.lua b/rt/between/mf/Core/d/.modulerc.lua new file mode 100644 index 000000000..00d9d39aa --- /dev/null +++ b/rt/between/mf/Core/d/.modulerc.lua @@ -0,0 +1 @@ +hide_version("d/1.4") diff --git a/rt/between/mf/Core/d/1.0.lua b/rt/between/mf/Core/d/1.0.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/between/mf/Core/d/1.1.lua b/rt/between/mf/Core/d/1.1.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/between/mf/Core/d/1.2.lua b/rt/between/mf/Core/d/1.2.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/between/mf/Core/d/1.3.lua b/rt/between/mf/Core/d/1.3.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/between/mf/Core/d/1.4.lua b/rt/between/mf/Core/d/1.4.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/between/mf/Core/d/1.5.lua b/rt/between/mf/Core/d/1.5.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/between/mf/Core/e/.modulerc.lua b/rt/between/mf/Core/e/.modulerc.lua new file mode 100644 index 000000000..9efca05f1 --- /dev/null +++ b/rt/between/mf/Core/e/.modulerc.lua @@ -0,0 +1,2 @@ +hide_version("d/1.4") +module_version("e/1.2","default") diff --git a/rt/between/mf/Core/e/1.0.lua b/rt/between/mf/Core/e/1.0.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/between/mf/Core/e/1.1.lua b/rt/between/mf/Core/e/1.1.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/between/mf/Core/e/1.2.lua b/rt/between/mf/Core/e/1.2.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/between/mf/Core/e/1.3.lua b/rt/between/mf/Core/e/1.3.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/between/mf/Core/e/1.4.lua b/rt/between/mf/Core/e/1.4.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/between/mf/Core/e/1.5.lua b/rt/between/mf/Core/e/1.5.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/between/out.txt b/rt/between/out.txt index 567971a2d..1afe08262 100644 --- a/rt/between/out.txt +++ b/rt/between/out.txt @@ -238,3 +238,23 @@ step 25 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load Md =========================== false +=========================== +step 26 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load Me +=========================== +LOADEDMODULES=b/1.4:M9:a/1.1:Mb:d/1.3:e/1.2:Me; +export LOADEDMODULES; +MODULEPATH=ProjectDIR/rt/between/mf/Core; +export MODULEPATH; +_LMFILES_=ProjectDIR/rt/between/mf/Core/b/1.4.lua:ProjectDIR/rt/between/mf/Core/M9.lua:ProjectDIR/rt/between/mf/Core/a/1.1.lua:ProjectDIR/rt/between/mf/Core/Mb.lua:ProjectDIR/rt/between/mf/Core/d/1.3.lua:ProjectDIR/rt/between/mf/Core/e/1.2.lua:ProjectDIR/rt/between/mf/Core/Me.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={M9={fn="ProjectDIR/rt/between/mf/Core/M9.lua",fullName="M9",loadOrder=2,propT={},stackDepth=0,status="active",userName="M9",wV="M.*zfinal",},Mb={fn="ProjectDIR/rt/between/mf/Core/Mb.lua",fullName="Mb",loadOrder=4,propT={},stackDepth=0,status="active",userName="Mb",wV="M.*zfinal",},Me={fn="ProjectDIR/rt/between/mf/Core/Me.lua",fullName="Me",loadOrder=7,propT={},stackDepth=0,status="active",userName="Me",wV="M.*zfinal",},a={fn="ProjectDIR/rt/between/mf/Core/a/1.1.lua",fullName="a/1.1",loadOrder=3,propT={},stackDepth=0,status="active",userName="a/1.1",wV="000000001.000000001.*zfinal",},b={fn="ProjectDIR/rt/between/mf/Core/b/1.4.lua",fullName="b/1.4",loadOrder=1,propT={},stackDepth=1,status="active",userName="b/1.4",wV="000000001.000000004.*zfinal",},d={fn="ProjectDIR/rt/between/mf/Core/d/1.3.lua",fullName="d/1.3",loadOrder=5,propT={},stackDepth=1,status="active",userName="d/1.3",wV="000000001.000000003.*zfinal",},e={fn="ProjectDIR/rt/between/mf/Core/e/1.2.lua",fullName="e/1.2",loadOrder=6,propT={},stackDepth=1,status="active",userName="e/1.2",wV="^00000001.000000002.*zfinal",},},mpathA={"ProjectDIR/rt/between/mf/Core",},systemBaseMPATH="ProjectDIR/rt/between/mf/Core",}'; +export _ModuleTable_; +=========================== +step 27 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing list +=========================== +MODULEPATH=ProjectDIR/rt/between/mf/Core; +export MODULEPATH; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={M9={fn="ProjectDIR/rt/between/mf/Core/M9.lua",fullName="M9",loadOrder=2,propT={},stackDepth=0,status="active",userName="M9",wV="M.*zfinal",},Mb={fn="ProjectDIR/rt/between/mf/Core/Mb.lua",fullName="Mb",loadOrder=4,propT={},stackDepth=0,status="active",userName="Mb",wV="M.*zfinal",},Me={fn="ProjectDIR/rt/between/mf/Core/Me.lua",fullName="Me",loadOrder=7,propT={},stackDepth=0,status="active",userName="Me",wV="M.*zfinal",},a={fn="ProjectDIR/rt/between/mf/Core/a/1.1.lua",fullName="a/1.1",loadOrder=3,propT={},stackDepth=0,status="active",userName="a/1.1",wV="000000001.000000001.*zfinal",},b={fn="ProjectDIR/rt/between/mf/Core/b/1.4.lua",fullName="b/1.4",loadOrder=1,propT={},stackDepth=1,status="active",userName="b/1.4",wV="000000001.000000004.*zfinal",},d={fn="ProjectDIR/rt/between/mf/Core/d/1.3.lua",fullName="d/1.3",loadOrder=5,propT={},stackDepth=1,status="active",userName="d/1.3",wV="000000001.000000003.*zfinal",},e={fn="ProjectDIR/rt/between/mf/Core/e/1.2.lua",fullName="e/1.2",loadOrder=6,propT={},stackDepth=1,status="active",userName="e/1.2",wV="^00000001.000000002.*zfinal",},},mpathA={"ProjectDIR/rt/between/mf/Core",},systemBaseMPATH="ProjectDIR/rt/between/mf/Core",}'; +export _ModuleTable_; diff --git a/src/MName.lua b/src/MName.lua index 24cc6d405..f713cebf2 100644 --- a/src/MName.lua +++ b/src/MName.lua @@ -544,6 +544,7 @@ function M.find_between(self, fileA) return x.pV < y.pV end) + local mrc = MRC:singleton() local fn = false local version = false local lowerBound = self.__range[1] @@ -553,23 +554,18 @@ function M.find_between(self, fileA) local pV = lowerBound local wV = " " -- this is less than the lower possible weight. - - --dbg.print{"lower: ",pV,"\n"} - --dbg.print{"upper: ",upperBound,"\n"} - --dbg.print{"wV: \"",wV,"\"\n\n"} - local idx = nil local found = false for j = 1,#a do local entry = a[j] local v = entry.pV - --dbg.print{"pV: ",pV,", v: ",v,", upper: \"",upperBound,"\"\n"} - --dbg.print{"pV <= v: ",pV <= v, ", v <= upperBound: ",v <= upperBound,", entry.wV > wV: ",entry.wV > wV,"\n"} - if (lowerFn(pV,v) and upperFn(v,upperBound) and entry.wV > wV) then - idx = j - pV = v - wV = entry.wV + if (isMarked(v) or mrc:isVisible{fullName=entry.fullName,sn=entry.sn,fn=entry.fn, + visibleT = {soft = true}}) then + idx = j + pV = v + wV = entry.wV + end end end if (idx) then From a046736d87a99f10d9364d83458bc94d9232b7a6 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Sat, 10 Aug 2024 14:23:49 -0600 Subject: [PATCH 076/198] Issue #690: added hidden module support for load(between()) --- rt/between/mf/Core/e/.modulerc.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/rt/between/mf/Core/e/.modulerc.lua b/rt/between/mf/Core/e/.modulerc.lua index 9efca05f1..0aa6fe372 100644 --- a/rt/between/mf/Core/e/.modulerc.lua +++ b/rt/between/mf/Core/e/.modulerc.lua @@ -1,2 +1 @@ -hide_version("d/1.4") module_version("e/1.2","default") From 7dba4cb2610870df9466b8f1365e94b91bfcd6c9 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Sat, 10 Aug 2024 14:34:34 -0600 Subject: [PATCH 077/198] Issue #690: adding tests to load hidden modules (.a/.1, .b/1.0, c/.1) --- rt/hidden/err.txt | 28 +++++++++++++++------- rt/hidden/hidden.tdesc | 15 +++++++----- rt/hidden/mf/.a/.1.lua | 0 rt/hidden/mf/.b/1.0.lua | 0 rt/hidden/mf/c/.1.lua | 0 rt/hidden/out.txt | 52 ++++++++++++++++++++++++++++++++++++----- 6 files changed, 75 insertions(+), 20 deletions(-) create mode 100644 rt/hidden/mf/.a/.1.lua create mode 100644 rt/hidden/mf/.b/1.0.lua create mode 100644 rt/hidden/mf/c/.1.lua diff --git a/rt/hidden/err.txt b/rt/hidden/err.txt index 15701e47a..bb3cb6ce2 100644 --- a/rt/hidden/err.txt +++ b/rt/hidden/err.txt @@ -2,14 +2,14 @@ step 1 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --version =========================== -Modules based on Lua: Version 8.7.44 2024-07-11 16:39 -06:00 +Modules based on Lua: Version 8.7.47 2024-07-22 10:04 -04:00 by Robert McLay mclay@tacc.utexas.edu =========================== step 2 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --show_hidden avail =========================== ProjectDIR/rt/hidden/mf - .system (H,S) lmod + .a/.1 (H) .b/1.0 (H) .system (H,S) c/.1 (H) lmod Where: H: Hidden Module S: Module is Sticky, requires --force to unload or purge @@ -24,22 +24,34 @@ lua ProjectDIR/src/lmod.in.lua shell --regression_testing load .system =========================== =========================== step 4 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load .a/.1 +=========================== +=========================== +step 5 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load .b/1.0 +=========================== +=========================== +step 6 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load c/.1 +=========================== +=========================== +step 7 lua ProjectDIR/src/lmod.in.lua shell --regression_testing list =========================== Currently Loaded Modules: - 1) .system (H,S) + 1) .system (H,S) 2) .a/.1 (H) 3) .b/1.0 (H) 4) c/.1 (H) Where: H: Hidden Module S: Module is Sticky, requires --force to unload or purge =========================== -step 5 +step 8 lua ProjectDIR/src/lmod.in.lua shell --regression_testing purge =========================== The following modules were not unloaded: (Use "module --force purge" to unload all): 1) .system =========================== -step 6 +step 9 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --show_hidden av =========================== ProjectDIR/rt/hidden/mf2/top @@ -56,15 +68,15 @@ If the avail list is too long consider trying: Use "module spider" to find all possible modules and extensions. Use "module keyword key1 key2 ..." to search for all possible modules matching any of the "keys". =========================== -step 7 +step 10 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load B =========================== =========================== -step 8 +step 11 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load A =========================== =========================== -step 9 +step 12 lua ProjectDIR/src/lmod.in.lua shell --regression_testing list =========================== Currently Loaded Modules: diff --git a/rt/hidden/hidden.tdesc b/rt/hidden/hidden.tdesc index b7451bb96..a9190ad58 100644 --- a/rt/hidden/hidden.tdesc +++ b/rt/hidden/hidden.tdesc @@ -27,16 +27,19 @@ testdescript = { runLmod --show_hidden avail # 2 runLmod load .system # 3 - runLmod list # 4 + runLmod load .a/.1 # 4 + runLmod load .b/1.0 # 5 + runLmod load c/.1 # 6 + runLmod list # 7 - runLmod purge # 5 + runLmod purge # 8 unsetMT export MODULEPATH=$(testDir)/mf2/top:$(testDir)/mf2/bottom export LMOD_TMOD_FIND_FIRST=1 - runLmod --show_hidden av # 6 - runLmod load B # 7 - runLmod load A # 8 - runLmod list # 9 + runLmod --show_hidden av # 9 + runLmod load B #10 + runLmod load A #11 + runLmod list #12 HOME=$ORIG_HOME cat _stdout.[0-9][0-9][0-9] > _stdout.orig diff --git a/rt/hidden/mf/.a/.1.lua b/rt/hidden/mf/.a/.1.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/hidden/mf/.b/1.0.lua b/rt/hidden/mf/.b/1.0.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/hidden/mf/c/.1.lua b/rt/hidden/mf/c/.1.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/hidden/out.txt b/rt/hidden/out.txt index 484c69dfe..49e261355 100644 --- a/rt/hidden/out.txt +++ b/rt/hidden/out.txt @@ -26,22 +26,62 @@ _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={[".system"]={f export _ModuleTable_; =========================== step 4 -lua ProjectDIR/src/lmod.in.lua shell --regression_testing list +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load .a/.1 =========================== +LOADEDMODULES=.system:.a/.1; +export LOADEDMODULES; MODULEPATH=ProjectDIR/rt/hidden/mf; export MODULEPATH; -_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={[".system"]={fn="ProjectDIR/rt/hidden/mf/.system.lua",fullName=".system",loadOrder=1,propT={lmod={sticky=1,},},stackDepth=0,status="active",userName=".system",wV="M.*zfinal",},},mpathA={"ProjectDIR/rt/hidden/mf",},systemBaseMPATH="ProjectDIR/rt/hidden/mf",}'; +_LMFILES_=ProjectDIR/rt/hidden/mf/.system.lua:ProjectDIR/rt/hidden/mf/.a/.1.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={[".a"]={fn="ProjectDIR/rt/hidden/mf/.a/.1.lua",fullName=".a/.1",loadOrder=2,propT={},stackDepth=0,status="active",userName=".a/.1",wV="000000000.000000001.*zfinal",},[".system"]={fn="ProjectDIR/rt/hidden/mf/.system.lua",fullName=".system",loadOrder=1,propT={lmod={sticky=1,},},stackDepth=0,status="active",userName=".system",wV="M.*zfinal",},},mpathA={"ProjectDIR/rt/hidden/mf",},systemBaseMPATH="ProjectDIR/rt/hidden/mf",}'; export _ModuleTable_; =========================== step 5 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load .b/1.0 +=========================== +LOADEDMODULES=.system:.a/.1:.b/1.0; +export LOADEDMODULES; +MODULEPATH=ProjectDIR/rt/hidden/mf; +export MODULEPATH; +_LMFILES_=ProjectDIR/rt/hidden/mf/.system.lua:ProjectDIR/rt/hidden/mf/.a/.1.lua:ProjectDIR/rt/hidden/mf/.b/1.0.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={[".a"]={fn="ProjectDIR/rt/hidden/mf/.a/.1.lua",fullName=".a/.1",loadOrder=2,propT={},stackDepth=0,status="active",userName=".a/.1",wV="000000000.000000001.*zfinal",},[".b"]={fn="ProjectDIR/rt/hidden/mf/.b/1.0.lua",fullName=".b/1.0",loadOrder=3,propT={},stackDepth=0,status="active",userName=".b/1.0",wV="000000001.*zfinal",},[".system"]={fn="ProjectDIR/rt/hidden/mf/.system.lua",fullName=".system",loadOrder=1,propT={lmod={sticky=1,},},stackDepth=0,status="active",userName=".system",wV="M.*zfinal",},},mpathA={"ProjectDIR/rt/hidden/mf",},systemBaseMPATH="ProjectDIR/rt/hidden/mf",}'; +export _ModuleTable_; +=========================== +step 6 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load c/.1 +=========================== +LOADEDMODULES=.system:.a/.1:.b/1.0:c/.1; +export LOADEDMODULES; +MODULEPATH=ProjectDIR/rt/hidden/mf; +export MODULEPATH; +_LMFILES_=ProjectDIR/rt/hidden/mf/.system.lua:ProjectDIR/rt/hidden/mf/.a/.1.lua:ProjectDIR/rt/hidden/mf/.b/1.0.lua:ProjectDIR/rt/hidden/mf/c/.1.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={[".a"]={fn="ProjectDIR/rt/hidden/mf/.a/.1.lua",fullName=".a/.1",loadOrder=2,propT={},stackDepth=0,status="active",userName=".a/.1",wV="000000000.000000001.*zfinal",},[".b"]={fn="ProjectDIR/rt/hidden/mf/.b/1.0.lua",fullName=".b/1.0",loadOrder=3,propT={},stackDepth=0,status="active",userName=".b/1.0",wV="000000001.*zfinal",},[".system"]={fn="ProjectDIR/rt/hidden/mf/.system.lua",fullName=".system",loadOrder=1,propT={lmod={sticky=1,},},stackDepth=0,status="active",userName=".system",wV="M.*zfinal",},c={fn="ProjectDIR/rt/hidden/mf/c/.1.lua",fullName="c/.1",loadOrder=4,propT={},stackDepth=0,status="active",userName="c/.1",wV="000000000.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/hidden/mf",},systemBaseMPATH="ProjectDIR/rt/hidden/mf",}'; +export _ModuleTable_; +=========================== +step 7 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing list +=========================== +MODULEPATH=ProjectDIR/rt/hidden/mf; +export MODULEPATH; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={[".a"]={fn="ProjectDIR/rt/hidden/mf/.a/.1.lua",fullName=".a/.1",loadOrder=2,propT={},stackDepth=0,status="active",userName=".a/.1",wV="000000000.000000001.*zfinal",},[".b"]={fn="ProjectDIR/rt/hidden/mf/.b/1.0.lua",fullName=".b/1.0",loadOrder=3,propT={},stackDepth=0,status="active",userName=".b/1.0",wV="000000001.*zfinal",},[".system"]={fn="ProjectDIR/rt/hidden/mf/.system.lua",fullName=".system",loadOrder=1,propT={lmod={sticky=1,},},stackDepth=0,status="active",userName=".system",wV="M.*zfinal",},c={fn="ProjectDIR/rt/hidden/mf/c/.1.lua",fullName="c/.1",loadOrder=4,propT={},stackDepth=0,status="active",userName="c/.1",wV="000000000.000000001.*zfinal",},},mpathA={"ProjectDIR/rt/hidden/mf",},systemBaseMPATH="ProjectDIR/rt/hidden/mf",}'; +export _ModuleTable_; +=========================== +step 8 lua ProjectDIR/src/lmod.in.lua shell --regression_testing purge =========================== +LOADEDMODULES=.system; +export LOADEDMODULES; MODULEPATH=ProjectDIR/rt/hidden/mf; export MODULEPATH; +_LMFILES_=ProjectDIR/rt/hidden/mf/.system.lua; +export _LMFILES_; _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={[".system"]={fn="ProjectDIR/rt/hidden/mf/.system.lua",fullName=".system",loadOrder=1,propT={lmod={sticky=1,},},stackDepth=0,status="active",userName=".system",wV="M.*zfinal",},},mpathA={"ProjectDIR/rt/hidden/mf",},systemBaseMPATH="ProjectDIR/rt/hidden/mf",}'; export _ModuleTable_; =========================== -step 6 +step 9 lua ProjectDIR/src/lmod.in.lua shell --regression_testing --show_hidden av =========================== unset LOADEDMODULES; @@ -53,7 +93,7 @@ unset _LMFILES_; _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/hidden/mf2/top","ProjectDIR/rt/hidden/mf2/bottom",},systemBaseMPATH="ProjectDIR/rt/hidden/mf2/top:ProjectDIR/rt/hidden/mf2/bottom",}'; export _ModuleTable_; =========================== -step 7 +step 10 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load B =========================== B=9.8.7; @@ -67,7 +107,7 @@ export _LMFILES_; _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={B={fn="ProjectDIR/rt/hidden/mf2/bottom/B/9.8.7.lua",fullName="B/9.8.7",loadOrder=1,propT={},stackDepth=0,status="active",userName="B",wV="000000009.000000008.000000007.*zfinal",},},mpathA={"ProjectDIR/rt/hidden/mf2/top","ProjectDIR/rt/hidden/mf2/bottom",},systemBaseMPATH="ProjectDIR/rt/hidden/mf2/top:ProjectDIR/rt/hidden/mf2/bottom",}'; export _ModuleTable_; =========================== -step 8 +step 11 lua ProjectDIR/src/lmod.in.lua shell --regression_testing load A =========================== A=1.0; @@ -81,7 +121,7 @@ export _LMFILES_; _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={A={fn="ProjectDIR/rt/hidden/mf2/top/A/1.0.lua",fullName="A/1.0",loadOrder=2,propT={},stackDepth=0,status="active",userName="A",wV="000000001.*zfinal",},B={fn="ProjectDIR/rt/hidden/mf2/bottom/B/9.8.7.lua",fullName="B/9.8.7",loadOrder=1,propT={},stackDepth=0,status="active",userName="B",wV="000000009.000000008.000000007.*zfinal",},},mpathA={"ProjectDIR/rt/hidden/mf2/top","ProjectDIR/rt/hidden/mf2/bottom",},systemBaseMPATH="ProjectDIR/rt/hidden/mf2/top:ProjectDIR/rt/hidden/mf2/bottom",}'; export _ModuleTable_; =========================== -step 9 +step 12 lua ProjectDIR/src/lmod.in.lua shell --regression_testing list =========================== MODULEPATH=ProjectDIR/rt/hidden/mf2/top:ProjectDIR/rt/hidden/mf2/bottom; From c2764e64703a5f46bbfe1b8b932cdfa8bbda5510 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Sun, 11 Aug 2024 13:38:55 -0600 Subject: [PATCH 078/198] adding bt2 to root systems --- build.rtm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.rtm b/build.rtm index f2ac13792..c5bfefeaa 100755 --- a/build.rtm +++ b/build.rtm @@ -132,7 +132,7 @@ case $SYSHOST in fi ;; - rios | jedrik | vato | devo | xalt-lmod | bt) + rios | jedrik | vato | devo | xalt-lmod | bt | bt2) SUDO="sudo" base="/opt/apps" PKG=$base/lmod/$PKG_VERSION From 4a0ae8b9f05d8ce1031aa45b14fc383f9b534f6c Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Mon, 12 Aug 2024 10:36:21 -0600 Subject: [PATCH 079/198] More dbg stmts in MRC and ModuleA --- src/MRC.lua | 2 ++ src/ModuleA.lua | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/MRC.lua b/src/MRC.lua index d3f1fdd96..5a8e2e215 100644 --- a/src/MRC.lua +++ b/src/MRC.lua @@ -486,6 +486,7 @@ end -- modT is a table with: sn, fullName and fn function M.isVisible(self, modT) + dbg.start{"MRC:isVisible(modT}"} local frameStk = require("FrameStk"):singleton() local mname = frameStk:mname() local mt = frameStk:mt() @@ -508,6 +509,7 @@ function M.isVisible(self, modT) modT.mt = mt hook.apply("isVisibleHook", modT) + dbg.fini("MRC:isVisible") return modT.isVisible end diff --git a/src/ModuleA.lua b/src/ModuleA.lua index 9440655f8..820c8351f 100644 --- a/src/ModuleA.lua +++ b/src/ModuleA.lua @@ -318,6 +318,7 @@ function M.__find_all_defaults(self) for fullName, vv in pairs(v.fileT) do local wV = mrc:find_wght_for_fullName(fullName, vv.wV) local vis = mrc:isVisible{fullName=fullName, sn=sn, fn=vv.fn} or isMarked(wV) + dbg.print{"fullName: ",fullName,", vis: ",vis,"\n"} if (show_hidden or vis) then count = count + 1 if (vis and (wV > weight)) then @@ -372,15 +373,19 @@ function M.build_availA(self) local function l_build_availA_helper(mpath, sn, v, A) local icnt = #A if (v.file ) then + dbg.print{"v.file: ",v.file,"\n"} if (show_hidden or mrc:isVisible{fullName=sn,sn=sn,fn=v.file}) then local metaModuleT = v.metaModuleT or {} + dbg.print{"saving v.file: ",v.file,"\n"} A[icnt+1] = { fullName = sn, pV = sn, fn = v.file, sn = sn, propT = metaModuleT.propT} end end if (next(v.fileT) ~= nil) then for fullName, vv in pairs(v.fileT) do + dbg.print{"fullName: ",fullName,",show_hidden: ",show_hidden,"\n"} if (show_hidden or mrc:isVisible{fullName=fullName,sn=sn,fn=vv.fn}) then icnt = icnt + 1 + dbg.print{"saving fullName: ",fullName,"\n"} A[icnt] = { fullName = fullName, pV = pathJoin(sn,vv.pV), fn = vv.fn, sn = sn, propT = vv.propT, provides = vv.provides} end From 236b93a3c557ee204e1661ead00ed2f497801cf1 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Mon, 12 Aug 2024 11:24:43 -0600 Subject: [PATCH 080/198] Issue #690: Now pass tests with first level changes --- rt/modulerc/err.txt | 8 +++++ rt/modulerc/mfB/Core/ABC/.modulerc.lua | 2 ++ rt/modulerc/mfB/Core/ABC/1.0.lua | 0 rt/modulerc/mfB/Core/ABC/2.0.lua | 0 rt/modulerc/mfB/Core/ABC/3.0.lua | 0 rt/modulerc/mfB/Core/ABC/4.0.lua | 0 rt/modulerc/modulerc.tdesc | 9 ++++-- rt/modulerc/out.txt | 25 ++++++++++++++++ src/MRC.lua | 41 +++++++++++++++++--------- src/ModuleA.lua | 12 ++++++-- src/Spider.lua | 41 ++++++++++++++------------ src/check_module_tree_syntax.in.lua | 2 +- src/mrc_load.lua | 20 ++++++++----- 13 files changed, 113 insertions(+), 47 deletions(-) create mode 100644 rt/modulerc/mfB/Core/ABC/.modulerc.lua create mode 100644 rt/modulerc/mfB/Core/ABC/1.0.lua create mode 100644 rt/modulerc/mfB/Core/ABC/2.0.lua create mode 100644 rt/modulerc/mfB/Core/ABC/3.0.lua create mode 100644 rt/modulerc/mfB/Core/ABC/4.0.lua diff --git a/rt/modulerc/err.txt b/rt/modulerc/err.txt index 703166a45..83b61073e 100644 --- a/rt/modulerc/err.txt +++ b/rt/modulerc/err.txt @@ -633,3 +633,11 @@ If the avail list is too long consider trying: "module overview" or "ml ov" to display the number of modules for each name. Use "module spider" to find all possible modules and extensions. Use "module keyword key1 key2 ..." to search for all possible modules matching any of the "keys". +=========================== +step 52 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing purge +=========================== +=========================== +step 53 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load ABC +=========================== diff --git a/rt/modulerc/mfB/Core/ABC/.modulerc.lua b/rt/modulerc/mfB/Core/ABC/.modulerc.lua new file mode 100644 index 000000000..50b6835f1 --- /dev/null +++ b/rt/modulerc/mfB/Core/ABC/.modulerc.lua @@ -0,0 +1,2 @@ +hide{name="ABC/3.0", kind="soft"} +hide{name="ABC/4.0", kind="hidden"} diff --git a/rt/modulerc/mfB/Core/ABC/1.0.lua b/rt/modulerc/mfB/Core/ABC/1.0.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/modulerc/mfB/Core/ABC/2.0.lua b/rt/modulerc/mfB/Core/ABC/2.0.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/modulerc/mfB/Core/ABC/3.0.lua b/rt/modulerc/mfB/Core/ABC/3.0.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/modulerc/mfB/Core/ABC/4.0.lua b/rt/modulerc/mfB/Core/ABC/4.0.lua new file mode 100644 index 000000000..e69de29bb diff --git a/rt/modulerc/modulerc.tdesc b/rt/modulerc/modulerc.tdesc index 7e95be54c..f3b10c012 100644 --- a/rt/modulerc/modulerc.tdesc +++ b/rt/modulerc/modulerc.tdesc @@ -147,10 +147,13 @@ EOF runLmod list #50 runLmod avail #51 + runLmod purge #52 + unsetMT + unset LMOD_MODULERC + export MODULEPATH_ROOT=$(testDir)/mfB + export MODULEPATH=$MODULEPATH_ROOT/Core - - - + runLmod load ABC #53 HOME=$ORIG_HOME cat _stdout.[0-9][0-9][0-9] > _stdout.orig diff --git a/rt/modulerc/out.txt b/rt/modulerc/out.txt index 066a12815..5c4e502cc 100644 --- a/rt/modulerc/out.txt +++ b/rt/modulerc/out.txt @@ -1377,3 +1377,28 @@ MODULEPATH=ProjectDIR/rt/modulerc/mfA/Core; export MODULEPATH; _ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={A={fn="ProjectDIR/rt/modulerc/mfA/Core/A/1.1.lua",fullName="A/1.1",loadOrder=1,propT={},ref_count=1,stackDepth=1,status="active",userName="A",wV="s00000001.000000001.*zfinal",},B={fn="ProjectDIR/rt/modulerc/mfA/Core/B/1.0.lua",fullName="B/1.0",loadOrder=2,propT={},ref_count=1,stackDepth=1,status="active",userName="B",wV="s00000001.*zfinal",},newDefaults={fn="ProjectDIR/rt/modulerc/mfA/Core/newDefaults/1.0.lua",fullName="newDefaults/1.0",loadOrder=3,propT={},stackDepth=0,status="active",userName="newDefaults",wV="000000001.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfA/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfA/Core",}'; export _ModuleTable_; +=========================== +step 52 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing purge +=========================== +unset LMOD_MODULERC; +unset LOADEDMODULES; +MODULEPATH=ProjectDIR/rt/modulerc/mfA/Core; +export MODULEPATH; +unset _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={},mpathA={"ProjectDIR/rt/modulerc/mfA/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfA/Core",}'; +export _ModuleTable_; +=========================== +step 53 +lua ProjectDIR/src/lmod.in.lua shell --regression_testing load ABC +=========================== +LOADEDMODULES=ABC/3.0; +export LOADEDMODULES; +__LMOD_REF_COUNT_MODULEPATH=ProjectDIR/rt/modulerc/mfB/Core:1; +export __LMOD_REF_COUNT_MODULEPATH; +MODULEPATH=ProjectDIR/rt/modulerc/mfB/Core; +export MODULEPATH; +_LMFILES_=ProjectDIR/rt/modulerc/mfB/Core/ABC/3.0.lua; +export _LMFILES_; +_ModuleTable_='_ModuleTable_={MTversion=3,depthT={},family={},mT={ABC={fn="ProjectDIR/rt/modulerc/mfB/Core/ABC/3.0.lua",fullName="ABC/3.0",loadOrder=1,propT={},stackDepth=0,status="active",userName="ABC",wV="000000003.*zfinal",},},mpathA={"ProjectDIR/rt/modulerc/mfB/Core",},systemBaseMPATH="ProjectDIR/rt/modulerc/mfB/Core",}'; +export _ModuleTable_; diff --git a/src/MRC.lua b/src/MRC.lua index 46744181f..ea16b93ab 100644 --- a/src/MRC.lua +++ b/src/MRC.lua @@ -134,7 +134,7 @@ function l_build(self, fnA) self:parseModA(modA, weight) end end - dbg.fini("MRC l_build") + --dbg.fini("MRC l_build") end local function l_save_su_weights(self, fullName, weight) @@ -202,6 +202,8 @@ function M.parseModA(self, modA, weight) elseif (entry.action == "hide_modulefile") then --dbg.print{"mfile: ", entry.mfile,"\n"} self.__hiddenT[entry.mfile] = {kind="hidden"} + elseif (entry.action == "hide") then + self.__hiddenT[entry.name] = entry end until true end @@ -398,6 +400,8 @@ function M.parseModA_for_moduleA(self, name, mpath, modA) elseif (entry.action == "hide_version" or entry.action == "hide_modulefile") then --dbg.print{"mfile: ", entry.mfile,"\n"} l_store_mpathT(self, mpath, "hiddenT", entry.mfile, {kind = "hidden"}); + elseif (entry.action == "hide") then + l_store_mpathT(self, mpath, "hiddenT", entry.name, entry); end end --dbg.fini("MRC:parseModA_for_moduleA") @@ -497,24 +501,32 @@ end -- modT is a table with: sn, fullName and fn function M.isVisible(self, modT) - local frameStk = require("FrameStk"):singleton() - local mname = frameStk:mname() - local mt = frameStk:mt() - local mpathA = modT.mpathA or mt:modulePathA() - local fullName = modT.fullName - local fn = modT.fn - local sn = modT.sn - local isVisible = true - local visibleT = modT.visibleT or {} + dbg.start{"MRC:isVisible(modT}"} + local frameStk = require("FrameStk"):singleton() + local mname = frameStk:mname() + local mt = frameStk:mt() + local mpathA = modT.mpathA or mt:modulePathA() + local fullName = modT.fullName + local fn = modT.fn + local sn = modT.sn + local show_hidden = modT.show_hidden + local isVisible = true + local visibleT = modT.visibleT or {} + local hard = false local resultT = l_findHiddenState(self, mpathA, sn, fullName, fn) if (type(resultT) == "table" ) then - isVisible = (visibleT[resultT.kind] ~= nil) + hard = (resultT.kind == "hard") + if (show_hidden) then + isVisible = (resultT.kind ~= "hard") + else + isVisible = (visibleT[resultT.kind] ~= nil) + end elseif (fullName:sub(1,1) == ".") then - isVisible = (visibleT.hidden == true) + isVisible = (visibleT.hidden == true or show_hidden) else local idx = fullName:find("/%.") - isVisible = (idx == nil) or (visibleT.hidden == true) + isVisible = (idx == nil) or (visibleT.hidden == true) or show_hidden end modT.isVisible = isVisible @@ -522,7 +534,8 @@ function M.isVisible(self, modT) modT.mt = mt hook.apply("isVisibleHook", modT) - return modT.isVisible + dbg.fini("MRC:isVisible") + return modT.isVisible, hard end function M.update(self, fnA) diff --git a/src/ModuleA.lua b/src/ModuleA.lua index 9440655f8..215dff958 100644 --- a/src/ModuleA.lua +++ b/src/ModuleA.lua @@ -317,7 +317,8 @@ function M.__find_all_defaults(self) elseif (next(v.fileT) ~= nil) then for fullName, vv in pairs(v.fileT) do local wV = mrc:find_wght_for_fullName(fullName, vv.wV) - local vis = mrc:isVisible{fullName=fullName, sn=sn, fn=vv.fn} or isMarked(wV) + local vis = mrc:isVisible{fullName=fullName, sn=sn, fn=vv.fn, visibleT = {soft=true}} or isMarked(wV) + dbg.print{"fullName: ",fullName,", vis: ",vis,"\n"} if (show_hidden or vis) then count = count + 1 if (vis and (wV > weight)) then @@ -372,15 +373,20 @@ function M.build_availA(self) local function l_build_availA_helper(mpath, sn, v, A) local icnt = #A if (v.file ) then - if (show_hidden or mrc:isVisible{fullName=sn,sn=sn,fn=v.file}) then + dbg.print{"v.file: ",v.file,"\n"} + if (mrc:isVisible{fullName=sn,sn=sn,fn=v.file, show_hidden = show_hidden}) then local metaModuleT = v.metaModuleT or {} + -- here is where the forbidden info goes. + dbg.print{"saving v.file: ",v.file,"\n"} A[icnt+1] = { fullName = sn, pV = sn, fn = v.file, sn = sn, propT = metaModuleT.propT} end end if (next(v.fileT) ~= nil) then for fullName, vv in pairs(v.fileT) do - if (show_hidden or mrc:isVisible{fullName=fullName,sn=sn,fn=vv.fn}) then + dbg.print{"fullName: ",fullName,",show_hidden: ",show_hidden,"\n"} + if ( mrc:isVisible{fullName=fullName, sn=sn, fn=vv.fn, show_hidden = show_hidden}) then icnt = icnt + 1 + dbg.print{"saving fullName: ",fullName,"\n"} A[icnt] = { fullName = fullName, pV = pathJoin(sn,vv.pV), fn = vv.fn, sn = sn, propT = vv.propT, provides = vv.provides} end diff --git a/src/Spider.lua b/src/Spider.lua index 9318e55d7..b1fe46882 100644 --- a/src/Spider.lua +++ b/src/Spider.lua @@ -103,9 +103,9 @@ function processDIR(value) l_process("dirA",value) end -local function l_isActiveMfile(mrc, full, sn, fn) +local function l_isActiveMfile(mrc, full, sn, fn, show_hidden) local version = extractVersion(full, sn) or "" - return mrc:isVisible{fullName=full, sn=sn, fn=fn}, version + return mrc:isVisible{fullName=full, sn=sn, fn=fn, show_hidden = show_hidden}, version end @@ -630,6 +630,7 @@ function M.buildDbT(self, mpathMapT, spiderT, dbT) return a[1] > b[1] end local function l_buildDbT_helper(mpath, sn, v, T) + local hard = false if (v.file) then local t = {} for i = 1,#dbT_keyA do @@ -640,10 +641,12 @@ function M.buildDbT(self, mpathMapT, spiderT, dbT) dbg.printT("parentAA",parentT[mpath]) sort(parentT[mpath], l_cmp) end - t.parentAA = parentT[mpath] - t.fullName = sn - t.hidden = not mrc:isVisible{fullName=sn, sn=sn, fn=v.file} - T[v.file] = t + t.parentAA = parentT[mpath] + t.fullName = sn + t.hidden, hard = not mrc:isVisible{fullName=sn, sn=sn, fn=v.file, mpathA=mpathA} + if (not hard) then + T[v.file] = t + end end if (next(v.fileT) ~= nil) then for fullName, vv in pairs(v.fileT) do @@ -656,11 +659,11 @@ function M.buildDbT(self, mpathMapT, spiderT, dbT) dbg.printT("parentAA",parentT[mpath]) sort(parentT[mpath], l_cmp) end - t.parentAA = parentT[mpath] - t.mpath = vv.mpath - t.fullName = fullName - t.hidden = not mrc:isVisible{fullName=fullName, sn=sn, fn=vv.fn, mpathA=mpathA} - if (not vv.dot_version) then + t.parentAA = parentT[mpath] + t.mpath = vv.mpath + t.fullName = fullName + t.hidden, hard = not mrc:isVisible{fullName=fullName, sn=sn, fn=vv.fn, mpathA=mpathA} + if (not vv.dot_version and not hard) then T[vv.fn] = t end end @@ -707,7 +710,7 @@ function M.buildProvideByT(self, dbT, providedByT) local mrc = MRC:singleton() for sn, vv in pairs(dbT) do for fullPath, v in pairs(vv) do - local hidden = not (show_hidden or mrc:isVisible{fullName=v.fullName, sn=sn, fn=fullPath}) + local hidden = not mrc:isVisible{fullName=v.fullName, sn=sn, fn=fullPath, show_hidden = show_hidden} if (v.provides ~= nil) then local providesA = v.provides for i = 1, #providesA do @@ -763,8 +766,8 @@ function M.Level0_terse(self,dbT, providedByT) local a = {} for sn, vv in pairs(dbT) do for fn, v in pairs(vv) do - local isActive, version = l_isActiveMfile(mrc, v.fullName, sn, fn) - if (show_hidden or isActive) then + local isActive, version = l_isActiveMfile(mrc, v.fullName, sn, fn, show_hidden) + if (isActive) then if (sn == v.fullName) then t[sn] = sn else @@ -839,8 +842,8 @@ function M.Level0Helper(self, dbT, providedByT, a) for sn, vv in pairs(dbT) do for fn,v in pairsByKeys(vv) do - local isActive, version = l_isActiveMfile(mrc, v.fullName, sn, fn) - if (show_hidden or isActive) then + local isActive, version = l_isActiveMfile(mrc, v.fullName, sn, fn, show_hidden) + if (isActive) then if (t[sn] == nil) then t[sn] = { Description = v.Description, versionA = { }, name = sn} end @@ -996,7 +999,7 @@ function M.spiderSearch(self, dbT, providedByT, userSearchPat, helpFlg) local fullA = {} for sn, vv in pairs(dbT) do for fn, v in pairs(vv) do - if (show_hidden or mrc:isVisible{fullName=v.fullName,sn=sn,fn=fn}) then + if (mrc:isVisible{fullName=v.fullName,sn=sn,fn=fn, show_hidden = show_hidden}) then fullA[#fullA+1] = {sn=sn, fullName=v.fullName} end end @@ -1106,7 +1109,7 @@ function M._Level1(self, dbT, providedByT, possibleA, sn, key, helpFlg) dbg.print{"Have T in l_countEntries\n"} dbg.print{"key: ",key,"\n"} for fn, v in pairs(T) do - if (show_hidden or mrc:isVisible{fullName=v.fullName,sn=sn,fn=fn}) then + if (mrc:isVisible{fullName=v.fullName,sn=sn,fn=fn, show_hidden = show_hidden}) then v.fn=fn if (v.fullName == key) then aa[#aa + 1] = v @@ -1225,7 +1228,7 @@ function M._Level1(self, dbT, providedByT, possibleA, sn, key, helpFlg) if (T) then dbg.print{"Have T\n"} for fn, v in pairsByKeys(T) do - local isActive, version = l_isActiveMfile(mrc, v.fullName, sn, fn) + local isActive, version = l_isActiveMfile(mrc, v.fullName, sn, fn, show_hidden) if (show_hidden or isActive) then local kk = sn .. "/" .. parseVersion(version) if (fullVT[kk] == nil) then diff --git a/src/check_module_tree_syntax.in.lua b/src/check_module_tree_syntax.in.lua index 507ed53a8..9c82cc1a6 100644 --- a/src/check_module_tree_syntax.in.lua +++ b/src/check_module_tree_syntax.in.lua @@ -140,7 +140,7 @@ function walk_spiderT(spiderT, mt, mList, errorT) if (next(v.fileT) ~= nil) then for fullName, vv in pairs(v.fileT) do - if (show_hidden or mrc:isVisible{fullName=fullName,sn=sn,fn=vv.fn}) then + if (mrc:isVisible{fullName=fullName,sn=sn,fn=vv.fn, show_hidden = show_hidden}) then check_syntax(mpath, mt, mList, sn, vv.fn, fullName, errorT.syntaxA) end end diff --git a/src/mrc_load.lua b/src/mrc_load.lua index 9a2cb6a1b..2de9cf0e9 100644 --- a/src/mrc_load.lua +++ b/src/mrc_load.lua @@ -40,6 +40,11 @@ require("mrc_sandbox") local dbg = require("Dbg"):dbg() local load = (_VERSION == "Lua 5.1") and loadstring or load +local s_fn = false + +function myMRC_file() + return s_fn +end function mrc_load(fn) dbg.start{"mrc_load(fn:",fn,")"} @@ -51,13 +56,14 @@ function mrc_load(fn) declare("ModA",false) ModA = {} - local myType = extname(fn) + s_fn = path_regularize(fn) + local myType = extname(s_fn) if (myType == ".lua") then - local f = io.open(fn) + local f = io.open(s_fn) whole = false if (f) then whole = f:read("*all") - dbg.start{"RC_File(",fn,")"} + dbg.start{"RC_File(",s_fn,")"} dbg.print{whole} dbg.fini("RC_File") f:close() @@ -69,19 +75,19 @@ function mrc_load(fn) msg = "Empty or non-existent file" end if (not status) then - LmodError{msg="e_Unable_2_Load", name = "", fn = fn, message = msg} + LmodError{msg="e_Unable_2_Load", name = "", fn = s_fn, message = msg} end else dbg.print{"Before runTCLprog\n"} - whole, ok = runTCLprog(pathJoin(cmdDir(),"RC2lua.tcl"), path_regularize(fn)) + whole, ok = runTCLprog(pathJoin(cmdDir(),"RC2lua.tcl"), s_fn) dbg.print{"After runTCLprog\n"} if (not ok) then - LmodError{msg = "e_Unable_2_parse", path = fn} + LmodError{msg = "e_Unable_2_parse", path = s_fn} end ok, func = pcall(load, whole) if (not ok or not func) then - LmodError{msg = "e_Unable_2_parse", path = fn} + LmodError{msg = "e_Unable_2_parse", path = s_fn} end if (func) then func() From 052bf324329320dc166b6f6bc05589481f7b5938 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Tue, 13 Aug 2024 11:34:50 -0600 Subject: [PATCH 081/198] fix FPATH if compinit -C fails --- init/bash.in | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/init/bash.in b/init/bash.in index fb5065841..5a798faff 100644 --- a/init/bash.in +++ b/init/bash.in @@ -25,25 +25,24 @@ fi __build_FPATH_for_zsh_ksh() { - zsh_fpath=$(unset FPATH; zsh -f -c 'echo $FPATH') + (compinit -c 2> /dev/null) + if [ "$?" != 0 ]; then + zsh_fpath=$(unset FPATH; zsh -f -c 'echo $FPATH') + fi export FPATH=$(@PKGV@/libexec/addto --append FPATH ${zsh_fpath} @PKGV@/init/ksh_funcs) unset zsh_fpath } -if [ -n "${ZSH_VERSION+x}" -a -z "${__LMOD_SET_ZSH_FPATH+x}" ]; then - export __LMOD_SET_ZSH_FPATH=1 +if [ -n "${ZSH_VERSION+x}" ]; then __build_FPATH_for_zsh_ksh fi if [ -n "${KSH_VERSION+x}" -o -n "${BASH_VERSION+x}" ]; then - if [ -z "${__LMOD_SET_KSH_FPATH:-}" ]; then - type zsh > /dev/null 2>&1 - if [ "$?" = 0 ]; then - __build_FPATH_for_zsh_ksh - else - export FPATH=$(@PKGV@/libexec/addto --append FPATH ${FPATH:-} @PKGV@/init/ksh_funcs) - fi - export __LMOD_SET_KSH_FPATH=1 + type zsh > /dev/null 2>&1 + if [ "$?" = 0 ]; then + __build_FPATH_for_zsh_ksh + else + export FPATH=$(@PKGV@/libexec/addto --append FPATH ${FPATH:-} @PKGV@/init/ksh_funcs) fi fi From 992804c68fd7e2f85caa634a24f8fd28f032901b Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Tue, 13 Aug 2024 11:42:39 -0600 Subject: [PATCH 082/198] fix FPATH if compinit -C fails --- init/bash.in | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/init/bash.in b/init/bash.in index fb5065841..09f021ead 100644 --- a/init/bash.in +++ b/init/bash.in @@ -25,25 +25,24 @@ fi __build_FPATH_for_zsh_ksh() { - zsh_fpath=$(unset FPATH; zsh -f -c 'echo $FPATH') - export FPATH=$(@PKGV@/libexec/addto --append FPATH ${zsh_fpath} @PKGV@/init/ksh_funcs) + (compinit -c 2> /dev/null) + if [ "$?" != 0 ]; then + zsh_fpath=$(unset FPATH; zsh -f -c 'echo $FPATH') + fi + export FPATH=$(@PKGV@/libexec/addto --append FPATH ${zsh_fpath:-} @PKGV@/init/ksh_funcs) unset zsh_fpath } -if [ -n "${ZSH_VERSION+x}" -a -z "${__LMOD_SET_ZSH_FPATH+x}" ]; then - export __LMOD_SET_ZSH_FPATH=1 +if [ -n "${ZSH_VERSION+x}" ]; then __build_FPATH_for_zsh_ksh fi if [ -n "${KSH_VERSION+x}" -o -n "${BASH_VERSION+x}" ]; then - if [ -z "${__LMOD_SET_KSH_FPATH:-}" ]; then - type zsh > /dev/null 2>&1 - if [ "$?" = 0 ]; then - __build_FPATH_for_zsh_ksh - else - export FPATH=$(@PKGV@/libexec/addto --append FPATH ${FPATH:-} @PKGV@/init/ksh_funcs) - fi - export __LMOD_SET_KSH_FPATH=1 + type zsh > /dev/null 2>&1 + if [ "$?" = 0 ]; then + __build_FPATH_for_zsh_ksh + else + export FPATH=$(@PKGV@/libexec/addto --append FPATH ${FPATH:-} @PKGV@/init/ksh_funcs) fi fi From 8acf6fbb08618638a860c3abf2b1f72fde3e0452 Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Tue, 13 Aug 2024 17:42:23 -0600 Subject: [PATCH 083/198] Better support for setting FPATH --- init/bash.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init/bash.in b/init/bash.in index 5a798faff..39a581bee 100644 --- a/init/bash.in +++ b/init/bash.in @@ -29,9 +29,9 @@ __build_FPATH_for_zsh_ksh() if [ "$?" != 0 ]; then zsh_fpath=$(unset FPATH; zsh -f -c 'echo $FPATH') fi - export FPATH=$(@PKGV@/libexec/addto --append FPATH ${zsh_fpath} @PKGV@/init/ksh_funcs) + export FPATH=$(@PKGV@/libexec/addto --append FPATH ${zsh_fpath:-} @PKGV@/init/ksh_funcs) unset zsh_fpath -} +} if [ -n "${ZSH_VERSION+x}" ]; then __build_FPATH_for_zsh_ksh From dc3d51c9dc1ac2ab17e5bf525a2aa3da467ee29d Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Wed, 14 Aug 2024 18:36:59 -0600 Subject: [PATCH 084/198] Switching MRC:isVisible{} to return resultT table --- TAGS | 516 ++++++++++----------- TAGS.world | 686 ++++++++++++++++------------ init/bash.in | 2 +- rt/modulerc/modulerc.tdesc | 2 + src/MName.lua | 126 ++--- src/MRC.lua | 33 +- src/ModuleA.lua | 25 +- src/Options.lua | 2 +- src/Spider.lua | 39 +- src/check_module_tree_syntax.in.lua | 3 +- src/ml_cmd.in.lua | 2 +- src/utils.lua | 3 +- 12 files changed, 794 insertions(+), 645 deletions(-) diff --git a/TAGS b/TAGS index c5eb7f245..8604ccfa7 100644 --- a/TAGS +++ b/TAGS @@ -199,54 +199,54 @@ function processLPATH(94,3221 function processPATH(98,3284 function processDIR(102,3345 local function l_isActiveMfile(106,3404 -local function l_processNewModulePATH(112,3572 -function Spider_dynamic_mpath(137,4370 -function Spider_append_path(145,4604 -local function l_loadMe(174,5478 -local function l_findModules(195,6298 -local function l_findChangeMPATH_modules(218,7200 -function M.searchSpiderDB(242,8059 -function M.searchSpiderDB(searchSpiderDB242,8059 -function M.findAllModules(301,9603 -function M.findAllModules(findAllModules301,9603 -function extend(414,12989 -function reverse(422,13112 -function copy(431,13239 -local function l_build_parentT(488,15385 - local function l_build_parentT_helper(493,15551 -local function l_build_mpathParentT(542,16976 -local function l_search_mpathParentT(572,17784 -local function l_build_keepT(588,18130 -function M.buildDbT(609,18687 -function M.buildDbT(buildDbT609,18687 - local function l_cmp(629,19387 - local function l_buildDbT_helper(632,19448 -function M.buildProvideByT(703,21646 -function M.buildProvideByT(buildProvideByT703,21646 - local function l_cmp(736,23015 -function M.Level0_terse(757,23422 -function M.Level0_terse(Level0_terse757,23422 -function M.Level0(795,24499 -function M.Level0(Level0795,24499 -local function l_case_independent_cmp_by_name(821,25126 -function M.Level0Helper(832,25340 -function M.Level0Helper(Level0Helper832,25340 -function M.setExactMatch(911,27865 -function M.setExactMatch(setExactMatch911,27865 -function M.getExactMatch(915,27930 -function M.getExactMatch(getExactMatch915,27930 -function M.spiderSearch(919,27988 -function M.spiderSearch(spiderSearch919,27988 -function M._Level1(1077,32762 -function M._Level1(_Level11077,32762 - local function l_countEntries(1094,33356 - local function cmp(1130,34344 -function M._Level2(1335,40465 -function M._Level2(_Level21335,40465 -function M.listModules(1519,45888 -function M.listModules(listModules1519,45888 -function M.dictModules(1530,46070 -function M.dictModules(dictModules1530,46070 +local function l_processNewModulePATH(113,3657 +function Spider_dynamic_mpath(138,4455 +function Spider_append_path(146,4689 +local function l_loadMe(175,5563 +local function l_findModules(196,6383 +local function l_findChangeMPATH_modules(219,7285 +function M.searchSpiderDB(243,8144 +function M.searchSpiderDB(searchSpiderDB243,8144 +function M.findAllModules(302,9688 +function M.findAllModules(findAllModules302,9688 +function extend(415,13074 +function reverse(423,13197 +function copy(432,13324 +local function l_build_parentT(489,15470 + local function l_build_parentT_helper(494,15636 +local function l_build_mpathParentT(543,17061 +local function l_search_mpathParentT(573,17869 +local function l_build_keepT(589,18215 +function M.buildDbT(610,18772 +function M.buildDbT(buildDbT610,18772 + local function l_cmp(630,19472 + local function l_buildDbT_helper(633,19533 +function M.buildProvideByT(711,22039 +function M.buildProvideByT(buildProvideByT711,22039 + local function l_cmp(744,23418 +function M.Level0_terse(765,23825 +function M.Level0_terse(Level0_terse765,23825 +function M.Level0(803,24900 +function M.Level0(Level0803,24900 +local function l_case_independent_cmp_by_name(829,25527 +function M.Level0Helper(840,25741 +function M.Level0Helper(Level0Helper840,25741 +function M.setExactMatch(919,28264 +function M.setExactMatch(setExactMatch919,28264 +function M.getExactMatch(923,28329 +function M.getExactMatch(getExactMatch923,28329 +function M.spiderSearch(927,28387 +function M.spiderSearch(spiderSearch927,28387 +function M._Level1(1085,33173 +function M._Level1(_Level11085,33173 + local function l_countEntries(1102,33767 + local function cmp(1139,34813 +function M._Level2(1344,40947 +function M._Level2(_Level21344,40947 +function M.listModules(1528,46370 +function M.listModules(listModules1528,46370 +function M.dictModules(1539,46552 +function M.dictModules(dictModules1539,46552 src/MN_Latest.lua,174 function M.show(49,2034 @@ -524,8 +524,9 @@ function M.test(test79,3006 function M.done(101,3595 function M.done(done101,3595 -src/mrc_load.lua,27 -function mrc_load(44,1894 +src/mrc_load.lua,56 +function myMRC_file(45,1913 +function mrc_load(49,1955 src/MT.lua,6038 function M.name(77,2958 @@ -742,14 +743,14 @@ function cmdDir(89,3155 local function l_nothing(127,4250 function walk_spiderT(130,4282 local function l_walk_moduleA_helper(135,4472 -function too_many_defaultA_entries(166,5408 -function check_syntax(171,5547 - local function l_loadMe(178,5869 -function check_syntax_error_handler(204,6742 -local function l_OptError(234,7840 -local function l_prt(241,7965 -function options(245,8020 -function main(280,8960 +function too_many_defaultA_entries(167,5466 +function check_syntax(172,5605 + local function l_loadMe(179,5927 +function check_syntax_error_handler(205,6800 +local function l_OptError(235,7898 +local function l_prt(242,8023 +function options(246,8078 +function main(281,9018 src/Version.lua,325 function M.branch(2,11 @@ -765,51 +766,51 @@ function M.date(date19,403 function M.name(20,458 function M.name(name20,458 -src/MRC.lua,1750 +src/MRC.lua,1752 local function l_new(77,2888 function M.singleton(110,4066 function M.singleton(singleton110,4066 function M.__clear(120,4246 function M.__clear(__clear120,4246 function l_build(126,4352 -local function l_save_su_weights(140,4685 - local function l_su_weight_helper(148,4850 -function M.parseModA(163,5202 -function M.parseModA(parseModA163,5202 -function l_buildMod2VersionT(211,7136 -local function l_find_alias_value(280,8796 -function M.resolve(297,9203 -function M.resolve(resolve297,9203 -function M.getMod2VersionT(323,9947 -function M.getMod2VersionT(getMod2VersionT323,9947 -function M.getFull2AliasesT(330,10126 -function M.getFull2AliasesT(getFull2AliasesT330,10126 -function M.getAlias2ModT(337,10308 -function M.getAlias2ModT(getAlias2ModT337,10308 -local function l_store_mpathT(344,10483 -function M.parseModA_for_moduleA(355,10775 -function M.parseModA_for_moduleA(parseModA_for_moduleA355,10775 -function M.fullNameDfltT(408,12886 -function M.fullNameDfltT(fullNameDfltT408,12886 -function M.mrcMpathT(412,12953 -function M.mrcMpathT(mrcMpathT412,12953 -function M.extract(416,13009 -function M.extract(extract416,13009 -function M.export(423,13216 -function M.export(export423,13216 -local function l_findHiddenState(432,13512 -local function l_import_helper(470,14508 -function M.import(482,14784 -function M.import(import482,14784 -function M.isVisible(499,15295 -function M.isVisible(isVisible499,15295 -function M.update(528,16177 -function M.update(update528,16177 -function l_find_all_su_defaults(535,16325 -function M.find_wght_for_fullName(549,16687 -function M.find_wght_for_fullName(find_wght_for_fullName549,16687 -function M.applyWeights(603,17946 -function M.applyWeights(applyWeights603,17946 +local function l_save_su_weights(140,4687 + local function l_su_weight_helper(148,4852 +function M.parseModA(163,5204 +function M.parseModA(parseModA163,5204 +function l_buildMod2VersionT(213,7231 +local function l_find_alias_value(282,8891 +function M.resolve(299,9298 +function M.resolve(resolve299,9298 +function M.getMod2VersionT(325,10042 +function M.getMod2VersionT(getMod2VersionT325,10042 +function M.getFull2AliasesT(332,10221 +function M.getFull2AliasesT(getFull2AliasesT332,10221 +function M.getAlias2ModT(339,10403 +function M.getAlias2ModT(getAlias2ModT339,10403 +local function l_store_mpathT(346,10578 +function M.parseModA_for_moduleA(357,10870 +function M.parseModA_for_moduleA(parseModA_for_moduleA357,10870 +function M.fullNameDfltT(412,13092 +function M.fullNameDfltT(fullNameDfltT412,13092 +function M.mrcMpathT(416,13159 +function M.mrcMpathT(mrcMpathT416,13159 +function M.extract(420,13215 +function M.extract(extract420,13215 +function M.export(427,13422 +function M.export(export427,13422 +local function l_findHiddenState(436,13718 +local function l_import_helper(478,14888 +function M.import(490,15164 +function M.import(import490,15164 +function M.isVisible(507,15675 +function M.isVisible(isVisible507,15675 +function M.update(560,17442 +function M.update(update560,17442 +function l_find_all_su_defaults(567,17590 +function M.find_wght_for_fullName(581,17952 +function M.find_wght_for_fullName(find_wght_for_fullName581,17952 +function M.applyWeights(635,19211 +function M.applyWeights(applyWeights635,19211 src/ReadLmodRC.lua,428 local function l_buildRC(55,2172 @@ -912,82 +913,82 @@ src/mrc_sandbox.lua,74 local function l_mrc_run5_1(80,3499 local function l_mrc_run5_2(93,4175 -src/MName.lua,2907 +src/MName.lua,2911 function M.className(52,2104 function M.className(className52,2104 local function l_lessthan(56,2159 local function l_lessthan_equal(60,2211 function M.new(69,2438 function M.new(new69,2438 -local function l_overRide_sType(158,5205 -function M.buildA(167,5525 -function M.buildA(buildA167,5525 -local function l_lazyEval(183,5869 -function M.valid(277,8973 -function M.valid(valid277,8973 -function M.userName(285,9079 -function M.userName(userName285,9079 -function M.origUserName(289,9136 -function M.origUserName(origUserName289,9136 -function M.sn(293,9201 -function M.sn(sn293,9201 -function M.fn(302,9364 -function M.fn(fn302,9364 -function M.version(311,9527 -function M.version(version311,9527 -function M.wV(318,9639 -function M.wV(wV318,9639 -function M.stackDepth(325,9741 -function M.stackDepth(stackDepth325,9741 -function M.setStackDepth(333,9926 -function M.setStackDepth(setStackDepth333,9926 -function M.set_ref_count(337,9998 -function M.set_ref_count(set_ref_count337,9998 -function M.set_depends_on_anyA(341,10069 -function M.set_depends_on_anyA(set_depends_on_anyA341,10069 -function M.get_depends_on_anyA(345,10172 -function M.get_depends_on_anyA(get_depends_on_anyA345,10172 -function M.ref_count(352,10308 -function M.ref_count(ref_count352,10308 -function M.fullName(359,10424 -function M.fullName(fullName359,10424 -local function l_find_exact_match(420,12763 -function M.find_exact_match(465,14451 -function M.find_exact_match(find_exact_match465,14451 -function M.find_exact_match_meta_module(478,15020 -function M.find_exact_match_meta_module(find_exact_match_meta_module478,15020 -local function l_find_highest_by_key(486,15340 -function M.find_highest(532,16767 -function M.find_highest(find_highest532,16767 -function M.find_latest(536,16859 -function M.find_latest(find_latest536,16859 -function M.find_between(540,16949 -function M.find_between(find_between540,16949 -local function l_rangeCk(587,18321 -function M.isloaded(617,19506 -function M.isloaded(isloaded617,19506 -function M.isPending(649,20453 -function M.isPending(isPending649,20453 -function M.defaultKind(662,20802 -function M.defaultKind(defaultKind662,20802 -function M.prereq(677,21105 -function M.prereq(prereq677,21105 -function M.conflictCk(711,22006 -function M.conflictCk(conflictCk711,22006 -function M.downstreamConflictCk(737,22821 -function M.downstreamConflictCk(downstreamConflictCk737,22821 -function M.set_depends_on_flag(761,23532 -function M.set_depends_on_flag(set_depends_on_flag761,23532 -function M.get_depends_on_flag(772,23787 -function M.get_depends_on_flag(get_depends_on_flag772,23787 -function M.reset(777,23913 -function M.reset(reset777,23913 -function M.actionName(784,24049 -function M.actionName(actionName784,24049 -function M.show(792,24265 -function M.show(show792,24265 -function M.print(796,24332 -function M.print(print796,24332 +local function l_overRide_sType(159,5234 +function M.buildA(168,5554 +function M.buildA(buildA168,5554 +local function l_lazyEval(184,5898 +function M.valid(279,9097 +function M.valid(valid279,9097 +function M.userName(287,9203 +function M.userName(userName287,9203 +function M.origUserName(291,9260 +function M.origUserName(origUserName291,9260 +function M.sn(295,9325 +function M.sn(sn295,9325 +function M.fn(304,9488 +function M.fn(fn304,9488 +function M.version(313,9651 +function M.version(version313,9651 +function M.wV(320,9763 +function M.wV(wV320,9763 +function M.stackDepth(327,9865 +function M.stackDepth(stackDepth327,9865 +function M.setStackDepth(335,10050 +function M.setStackDepth(setStackDepth335,10050 +function M.set_ref_count(339,10122 +function M.set_ref_count(set_ref_count339,10122 +function M.set_depends_on_anyA(343,10193 +function M.set_depends_on_anyA(set_depends_on_anyA343,10193 +function M.get_depends_on_anyA(347,10296 +function M.get_depends_on_anyA(get_depends_on_anyA347,10296 +function M.ref_count(354,10432 +function M.ref_count(ref_count354,10432 +function M.fullName(361,10548 +function M.fullName(fullName361,10548 +local function l_find_exact_match(422,12887 +function M.find_exact_match(471,14784 +function M.find_exact_match(find_exact_match471,14784 +function M.find_exact_match_meta_module(484,15380 +function M.find_exact_match_meta_module(find_exact_match_meta_module484,15380 +local function l_find_highest_by_key(492,15725 +function M.find_highest(542,17383 +function M.find_highest(find_highest542,17383 +function M.find_latest(546,17475 +function M.find_latest(find_latest546,17475 +function M.find_between(550,17565 +function M.find_between(find_between550,17565 +local function l_rangeCk(597,19046 +function M.isloaded(627,20231 +function M.isloaded(isloaded627,20231 +function M.isPending(659,21178 +function M.isPending(isPending659,21178 +function M.defaultKind(672,21527 +function M.defaultKind(defaultKind672,21527 +function M.prereq(687,21830 +function M.prereq(prereq687,21830 +function M.conflictCk(721,22731 +function M.conflictCk(conflictCk721,22731 +function M.downstreamConflictCk(747,23546 +function M.downstreamConflictCk(downstreamConflictCk747,23546 +function M.set_depends_on_flag(771,24257 +function M.set_depends_on_flag(set_depends_on_flag771,24257 +function M.get_depends_on_flag(782,24512 +function M.get_depends_on_flag(get_depends_on_flag782,24512 +function M.reset(787,24638 +function M.reset(reset787,24638 +function M.actionName(794,24774 +function M.actionName(actionName794,24774 +function M.show(802,24990 +function M.show(show802,24990 +function M.print(806,25057 +function M.print(print806,25057 src/MC_CheckSyntax.lua,162 function M.add_property(107,4627 @@ -1404,7 +1405,7 @@ function hide_version(70,2842 function hide_modulefile(77,3043 function hide(82,3211 -src/utils.lua,2010 +src/utils.lua,2011 function argsPack(76,2914 function __FILE__(82,3070 function __LINE__(86,3133 @@ -1416,53 +1417,53 @@ function build_i18n_messages(198,5837 function cmdDir(234,6855 function findLuaProg(241,7068 function colorizePropA(262,7808 -function expert(323,9739 -function extractFullName(330,9858 -function extractVersion(335,9999 -function findAdminFn(347,10329 -function readAdmin(364,10990 -function getMT(437,13198 -function getModuleRCT(465,13879 -function isMarked(518,15756 -function length(529,16054 -function optionTbl(538,16256 -function paired2pathT(544,16327 -function path2pathA(585,17466 -function quiet(629,18488 -function regular_cmp(636,18627 -function sanizatizeTbl(640,18680 -function setenv_lmod_version(675,19613 -function ShowCmdA(702,20381 -local function l_arg2str(718,20770 -function s_indent(740,21297 -function ShowCmdStr(748,21593 -function ShowHelpStr(800,22795 -function UUIDString(822,23379 -function case_independent_cmp(850,24223 -function activateWarning(867,24719 -function deactivateWarning(873,24891 -function haveWarnings(879,25069 -function setStatusFlag(885,25228 -function getStatusFlag(892,25417 -local function l_restoreEnv(896,25466 -local function l_runTCLprog(924,26028 -local function l_build_runTCLprog(944,26731 -function usingFastTCLInterp(958,27080 -local function l_build_accept_function(964,27317 -local function l_build_allow_dups_function(978,27614 -local function l_build_epoch_function(991,27904 -local function l_build_prepend_order_function(1026,28868 -function setSyntaxMode(1048,29391 -function checkSyntaxMode(1051,29454 -local function l_build_quarantineT(1057,29538 -function save_set_env(1070,29876 -function reset_env(1080,30094 -function initialize_lmod(1095,30423 -function tracing_msg(1160,32753 -function dynamic_shell(1174,33126 -function locatePkg(1223,34506 -function wrap_complete(1235,34739 -function unwrap_complete(1238,34809 +function expert(324,9772 +function extractFullName(331,9891 +function extractVersion(336,10032 +function findAdminFn(348,10362 +function readAdmin(365,11023 +function getMT(438,13231 +function getModuleRCT(466,13912 +function isMarked(519,15789 +function length(530,16087 +function optionTbl(539,16289 +function paired2pathT(545,16360 +function path2pathA(586,17499 +function quiet(630,18521 +function regular_cmp(637,18660 +function sanizatizeTbl(641,18713 +function setenv_lmod_version(676,19646 +function ShowCmdA(703,20414 +local function l_arg2str(719,20803 +function s_indent(741,21330 +function ShowCmdStr(749,21626 +function ShowHelpStr(801,22828 +function UUIDString(823,23412 +function case_independent_cmp(851,24256 +function activateWarning(868,24752 +function deactivateWarning(874,24924 +function haveWarnings(880,25102 +function setStatusFlag(886,25261 +function getStatusFlag(893,25450 +local function l_restoreEnv(897,25499 +local function l_runTCLprog(925,26061 +local function l_build_runTCLprog(945,26764 +function usingFastTCLInterp(959,27113 +local function l_build_accept_function(965,27350 +local function l_build_allow_dups_function(979,27647 +local function l_build_epoch_function(992,27937 +local function l_build_prepend_order_function(1027,28901 +function setSyntaxMode(1049,29424 +function checkSyntaxMode(1052,29487 +local function l_build_quarantineT(1058,29571 +function save_set_env(1071,29909 +function reset_env(1081,30127 +function initialize_lmod(1096,30456 +function tracing_msg(1161,32786 +function dynamic_shell(1175,33159 +function locatePkg(1224,34539 +function wrap_complete(1236,34772 +function unwrap_complete(1239,34842 src/cmdfuncs.lua,1144 local function l_Access(76,3264 @@ -1516,34 +1517,34 @@ function M.applyWeights(applyWeights258,8497 function M.__find_all_defaults(289,9505 function M.__find_all_defaults(__find_all_defaults289,9505 local function l_find_all_defaults_helper(296,9752 -function M.build_availA(367,12117 -function M.build_availA(build_availA367,12117 - local function l_build_availA_helper(372,12273 -function M.inherited_search(415,13731 -function M.inherited_search(inherited_search415,13731 - local function l_inherited_search_helper(418,13868 -function M.search(487,15956 -function M.search(search487,15956 -local function l_checkforNV(504,16429 -local function l_build_from_spiderT(513,16585 -function M.update(543,17633 -function M.update(update543,17633 -function M.__new(607,19831 -function M.__new(__new607,19831 -function M.moduleA(637,20680 -function M.moduleA(moduleA637,20680 -function M.isNVV(641,20735 -function M.isNVV(isNVV641,20735 -function M.spiderBuilt(645,20786 -function M.spiderBuilt(spiderBuilt645,20786 -function M.locationT(649,20849 -function M.locationT(locationT649,20849 -function M.defaultT(659,21065 -function M.defaultT(defaultT659,21065 -function M.singleton(671,21331 -function M.singleton(singleton671,21331 -function M.__clear(697,22070 -function M.__clear(__clear697,22070 +function M.build_availA(372,12371 +function M.build_availA(build_availA372,12371 + local function l_build_availA_helper(377,12527 +function M.inherited_search(428,14485 +function M.inherited_search(inherited_search428,14485 + local function l_inherited_search_helper(431,14622 +function M.search(500,16710 +function M.search(search500,16710 +local function l_checkforNV(517,17183 +local function l_build_from_spiderT(526,17339 +function M.update(556,18387 +function M.update(update556,18387 +function M.__new(620,20585 +function M.__new(__new620,20585 +function M.moduleA(650,21434 +function M.moduleA(moduleA650,21434 +function M.isNVV(654,21489 +function M.isNVV(isNVV654,21489 +function M.spiderBuilt(658,21540 +function M.spiderBuilt(spiderBuilt658,21540 +function M.locationT(662,21603 +function M.locationT(locationT662,21603 +function M.defaultT(672,21819 +function M.defaultT(defaultT672,21819 +function M.singleton(684,22085 +function M.singleton(singleton684,22085 +function M.__clear(710,22824 +function M.__clear(__clear710,22824 logos/2x/Lmod-black@2x.png,110 NKKvڵcO{C~}Ji(e8FB=_X4$ɡ9 }h<`AxZ߄fdtVzAxZ߄fdtV5,2308 @@ -1691,26 +1692,25 @@ init/ksh_funcs/ml,13 init/ksh_funcs/clearMT,18 clearMT(6,202 -init/bash.in,484 +init/bash.in,429 *v*x*) __lmod_vx=10,259 *v*) __lmod_vx=11,289 *x*) __lmod_vx=12,319 esac;13,349 __build_FPATH_for_zsh_ksh(26,681 - export __LMOD_SET_ZSH_FPATH=34,944 - export FPATH=44,1214 - export __LMOD_SET_KSH_FPATH=46,1312 - module(97,3060 - module(104,3267 -LMOD_VERSION=138,4310 - settarg 142,4406 -ml(158,4887 -clearMT(173,5233 -clearLmod(178,5304 -xSetTitleLmod(184,5403 - set -$__lmod_vx;$__lmod_vx200,5877 - unset __lmod_vx;201,5896 -fi;202,5915 + export FPATH=45,1155 +export LMOD_ROOT=51,1290 + module(96,2958 + module(103,3165 +LMOD_VERSION=137,4208 + settarg 141,4304 +ml(157,4785 +clearMT(172,5131 +clearLmod(177,5202 +xSetTitleLmod(183,5301 + set -$__lmod_vx;$__lmod_vx199,5775 + unset __lmod_vx;200,5794 +fi;201,5813 init/sh.in,43 LMOD_ROOT=3,11 diff --git a/TAGS.world b/TAGS.world index 6de425e43..0d670e1a6 100644 --- a/TAGS.world +++ b/TAGS.world @@ -477,54 +477,54 @@ function processLPATH(94,3221 function processPATH(98,3284 function processDIR(102,3345 local function l_isActiveMfile(106,3404 -local function l_processNewModulePATH(112,3572 -function Spider_dynamic_mpath(137,4370 -function Spider_append_path(145,4604 -local function l_loadMe(174,5478 -local function l_findModules(195,6298 -local function l_findChangeMPATH_modules(218,7200 -function M.searchSpiderDB(242,8059 -function M.searchSpiderDB(searchSpiderDB242,8059 -function M.findAllModules(301,9603 -function M.findAllModules(findAllModules301,9603 -function extend(414,12989 -function reverse(422,13112 -function copy(431,13239 -local function l_build_parentT(488,15385 - local function l_build_parentT_helper(493,15551 -local function l_build_mpathParentT(542,16976 -local function l_search_mpathParentT(572,17784 -local function l_build_keepT(588,18130 -function M.buildDbT(609,18687 -function M.buildDbT(buildDbT609,18687 - local function l_cmp(629,19387 - local function l_buildDbT_helper(632,19448 -function M.buildProvideByT(703,21646 -function M.buildProvideByT(buildProvideByT703,21646 - local function l_cmp(736,23015 -function M.Level0_terse(757,23422 -function M.Level0_terse(Level0_terse757,23422 -function M.Level0(795,24499 -function M.Level0(Level0795,24499 -local function l_case_independent_cmp_by_name(821,25126 -function M.Level0Helper(832,25340 -function M.Level0Helper(Level0Helper832,25340 -function M.setExactMatch(911,27865 -function M.setExactMatch(setExactMatch911,27865 -function M.getExactMatch(915,27930 -function M.getExactMatch(getExactMatch915,27930 -function M.spiderSearch(919,27988 -function M.spiderSearch(spiderSearch919,27988 -function M._Level1(1077,32762 -function M._Level1(_Level11077,32762 - local function l_countEntries(1094,33356 - local function cmp(1130,34344 -function M._Level2(1335,40465 -function M._Level2(_Level21335,40465 -function M.listModules(1519,45888 -function M.listModules(listModules1519,45888 -function M.dictModules(1530,46070 -function M.dictModules(dictModules1530,46070 +local function l_processNewModulePATH(113,3657 +function Spider_dynamic_mpath(138,4455 +function Spider_append_path(146,4689 +local function l_loadMe(175,5563 +local function l_findModules(196,6383 +local function l_findChangeMPATH_modules(219,7285 +function M.searchSpiderDB(243,8144 +function M.searchSpiderDB(searchSpiderDB243,8144 +function M.findAllModules(302,9688 +function M.findAllModules(findAllModules302,9688 +function extend(415,13074 +function reverse(423,13197 +function copy(432,13324 +local function l_build_parentT(489,15470 + local function l_build_parentT_helper(494,15636 +local function l_build_mpathParentT(543,17061 +local function l_search_mpathParentT(573,17869 +local function l_build_keepT(589,18215 +function M.buildDbT(610,18772 +function M.buildDbT(buildDbT610,18772 + local function l_cmp(630,19472 + local function l_buildDbT_helper(633,19533 +function M.buildProvideByT(711,22039 +function M.buildProvideByT(buildProvideByT711,22039 + local function l_cmp(744,23418 +function M.Level0_terse(765,23825 +function M.Level0_terse(Level0_terse765,23825 +function M.Level0(803,24900 +function M.Level0(Level0803,24900 +local function l_case_independent_cmp_by_name(829,25527 +function M.Level0Helper(840,25741 +function M.Level0Helper(Level0Helper840,25741 +function M.setExactMatch(919,28264 +function M.setExactMatch(setExactMatch919,28264 +function M.getExactMatch(923,28329 +function M.getExactMatch(getExactMatch923,28329 +function M.spiderSearch(927,28387 +function M.spiderSearch(spiderSearch927,28387 +function M._Level1(1085,33173 +function M._Level1(_Level11085,33173 + local function l_countEntries(1102,33767 + local function cmp(1139,34813 +function M._Level2(1344,40947 +function M._Level2(_Level21344,40947 +function M.listModules(1528,46370 +function M.listModules(listModules1528,46370 +function M.dictModules(1539,46552 +function M.dictModules(dictModules1539,46552 src/MN_Latest.lua,174 function M.show(49,2034 @@ -802,8 +802,9 @@ function M.test(test79,3006 function M.done(101,3595 function M.done(done101,3595 -src/mrc_load.lua,27 -function mrc_load(44,1894 +src/mrc_load.lua,56 +function myMRC_file(45,1913 +function mrc_load(49,1955 src/MT.lua,6038 function M.name(77,2958 @@ -1020,14 +1021,14 @@ function cmdDir(89,3155 local function l_nothing(127,4250 function walk_spiderT(130,4282 local function l_walk_moduleA_helper(135,4472 -function too_many_defaultA_entries(166,5408 -function check_syntax(171,5547 - local function l_loadMe(178,5869 -function check_syntax_error_handler(204,6742 -local function l_OptError(234,7840 -local function l_prt(241,7965 -function options(245,8020 -function main(280,8960 +function too_many_defaultA_entries(167,5466 +function check_syntax(172,5605 + local function l_loadMe(179,5927 +function check_syntax_error_handler(205,6800 +local function l_OptError(235,7898 +local function l_prt(242,8023 +function options(246,8078 +function main(281,9018 src/Version.lua,325 function M.branch(2,11 @@ -1043,51 +1044,51 @@ function M.date(date19,403 function M.name(20,458 function M.name(name20,458 -src/MRC.lua,1750 +src/MRC.lua,1752 local function l_new(77,2888 function M.singleton(110,4066 function M.singleton(singleton110,4066 function M.__clear(120,4246 function M.__clear(__clear120,4246 function l_build(126,4352 -local function l_save_su_weights(140,4685 - local function l_su_weight_helper(148,4850 -function M.parseModA(163,5202 -function M.parseModA(parseModA163,5202 -function l_buildMod2VersionT(211,7136 -local function l_find_alias_value(280,8796 -function M.resolve(297,9203 -function M.resolve(resolve297,9203 -function M.getMod2VersionT(323,9947 -function M.getMod2VersionT(getMod2VersionT323,9947 -function M.getFull2AliasesT(330,10126 -function M.getFull2AliasesT(getFull2AliasesT330,10126 -function M.getAlias2ModT(337,10308 -function M.getAlias2ModT(getAlias2ModT337,10308 -local function l_store_mpathT(344,10483 -function M.parseModA_for_moduleA(355,10775 -function M.parseModA_for_moduleA(parseModA_for_moduleA355,10775 -function M.fullNameDfltT(408,12886 -function M.fullNameDfltT(fullNameDfltT408,12886 -function M.mrcMpathT(412,12953 -function M.mrcMpathT(mrcMpathT412,12953 -function M.extract(416,13009 -function M.extract(extract416,13009 -function M.export(423,13216 -function M.export(export423,13216 -local function l_findHiddenState(432,13512 -local function l_import_helper(470,14508 -function M.import(482,14784 -function M.import(import482,14784 -function M.isVisible(499,15295 -function M.isVisible(isVisible499,15295 -function M.update(528,16177 -function M.update(update528,16177 -function l_find_all_su_defaults(535,16325 -function M.find_wght_for_fullName(549,16687 -function M.find_wght_for_fullName(find_wght_for_fullName549,16687 -function M.applyWeights(603,17946 -function M.applyWeights(applyWeights603,17946 +local function l_save_su_weights(140,4687 + local function l_su_weight_helper(148,4852 +function M.parseModA(163,5204 +function M.parseModA(parseModA163,5204 +function l_buildMod2VersionT(213,7231 +local function l_find_alias_value(282,8891 +function M.resolve(299,9298 +function M.resolve(resolve299,9298 +function M.getMod2VersionT(325,10042 +function M.getMod2VersionT(getMod2VersionT325,10042 +function M.getFull2AliasesT(332,10221 +function M.getFull2AliasesT(getFull2AliasesT332,10221 +function M.getAlias2ModT(339,10403 +function M.getAlias2ModT(getAlias2ModT339,10403 +local function l_store_mpathT(346,10578 +function M.parseModA_for_moduleA(357,10870 +function M.parseModA_for_moduleA(parseModA_for_moduleA357,10870 +function M.fullNameDfltT(412,13092 +function M.fullNameDfltT(fullNameDfltT412,13092 +function M.mrcMpathT(416,13159 +function M.mrcMpathT(mrcMpathT416,13159 +function M.extract(420,13215 +function M.extract(extract420,13215 +function M.export(427,13422 +function M.export(export427,13422 +local function l_findHiddenState(436,13718 +local function l_import_helper(478,14888 +function M.import(490,15164 +function M.import(import490,15164 +function M.isVisible(507,15675 +function M.isVisible(isVisible507,15675 +function M.update(560,17442 +function M.update(update560,17442 +function l_find_all_su_defaults(567,17590 +function M.find_wght_for_fullName(581,17952 +function M.find_wght_for_fullName(find_wght_for_fullName581,17952 +function M.applyWeights(635,19211 +function M.applyWeights(applyWeights635,19211 src/ReadLmodRC.lua,428 local function l_buildRC(55,2172 @@ -1190,82 +1191,82 @@ src/mrc_sandbox.lua,74 local function l_mrc_run5_1(80,3499 local function l_mrc_run5_2(93,4175 -src/MName.lua,2907 +src/MName.lua,2911 function M.className(52,2104 function M.className(className52,2104 local function l_lessthan(56,2159 local function l_lessthan_equal(60,2211 function M.new(69,2438 function M.new(new69,2438 -local function l_overRide_sType(158,5205 -function M.buildA(167,5525 -function M.buildA(buildA167,5525 -local function l_lazyEval(183,5869 -function M.valid(277,8973 -function M.valid(valid277,8973 -function M.userName(285,9079 -function M.userName(userName285,9079 -function M.origUserName(289,9136 -function M.origUserName(origUserName289,9136 -function M.sn(293,9201 -function M.sn(sn293,9201 -function M.fn(302,9364 -function M.fn(fn302,9364 -function M.version(311,9527 -function M.version(version311,9527 -function M.wV(318,9639 -function M.wV(wV318,9639 -function M.stackDepth(325,9741 -function M.stackDepth(stackDepth325,9741 -function M.setStackDepth(333,9926 -function M.setStackDepth(setStackDepth333,9926 -function M.set_ref_count(337,9998 -function M.set_ref_count(set_ref_count337,9998 -function M.set_depends_on_anyA(341,10069 -function M.set_depends_on_anyA(set_depends_on_anyA341,10069 -function M.get_depends_on_anyA(345,10172 -function M.get_depends_on_anyA(get_depends_on_anyA345,10172 -function M.ref_count(352,10308 -function M.ref_count(ref_count352,10308 -function M.fullName(359,10424 -function M.fullName(fullName359,10424 -local function l_find_exact_match(420,12763 -function M.find_exact_match(465,14451 -function M.find_exact_match(find_exact_match465,14451 -function M.find_exact_match_meta_module(478,15020 -function M.find_exact_match_meta_module(find_exact_match_meta_module478,15020 -local function l_find_highest_by_key(486,15340 -function M.find_highest(532,16767 -function M.find_highest(find_highest532,16767 -function M.find_latest(536,16859 -function M.find_latest(find_latest536,16859 -function M.find_between(540,16949 -function M.find_between(find_between540,16949 -local function l_rangeCk(587,18321 -function M.isloaded(617,19506 -function M.isloaded(isloaded617,19506 -function M.isPending(649,20453 -function M.isPending(isPending649,20453 -function M.defaultKind(662,20802 -function M.defaultKind(defaultKind662,20802 -function M.prereq(677,21105 -function M.prereq(prereq677,21105 -function M.conflictCk(711,22006 -function M.conflictCk(conflictCk711,22006 -function M.downstreamConflictCk(737,22821 -function M.downstreamConflictCk(downstreamConflictCk737,22821 -function M.set_depends_on_flag(761,23532 -function M.set_depends_on_flag(set_depends_on_flag761,23532 -function M.get_depends_on_flag(772,23787 -function M.get_depends_on_flag(get_depends_on_flag772,23787 -function M.reset(777,23913 -function M.reset(reset777,23913 -function M.actionName(784,24049 -function M.actionName(actionName784,24049 -function M.show(792,24265 -function M.show(show792,24265 -function M.print(796,24332 -function M.print(print796,24332 +local function l_overRide_sType(159,5234 +function M.buildA(168,5554 +function M.buildA(buildA168,5554 +local function l_lazyEval(184,5898 +function M.valid(279,9097 +function M.valid(valid279,9097 +function M.userName(287,9203 +function M.userName(userName287,9203 +function M.origUserName(291,9260 +function M.origUserName(origUserName291,9260 +function M.sn(295,9325 +function M.sn(sn295,9325 +function M.fn(304,9488 +function M.fn(fn304,9488 +function M.version(313,9651 +function M.version(version313,9651 +function M.wV(320,9763 +function M.wV(wV320,9763 +function M.stackDepth(327,9865 +function M.stackDepth(stackDepth327,9865 +function M.setStackDepth(335,10050 +function M.setStackDepth(setStackDepth335,10050 +function M.set_ref_count(339,10122 +function M.set_ref_count(set_ref_count339,10122 +function M.set_depends_on_anyA(343,10193 +function M.set_depends_on_anyA(set_depends_on_anyA343,10193 +function M.get_depends_on_anyA(347,10296 +function M.get_depends_on_anyA(get_depends_on_anyA347,10296 +function M.ref_count(354,10432 +function M.ref_count(ref_count354,10432 +function M.fullName(361,10548 +function M.fullName(fullName361,10548 +local function l_find_exact_match(422,12887 +function M.find_exact_match(471,14784 +function M.find_exact_match(find_exact_match471,14784 +function M.find_exact_match_meta_module(484,15380 +function M.find_exact_match_meta_module(find_exact_match_meta_module484,15380 +local function l_find_highest_by_key(492,15725 +function M.find_highest(542,17383 +function M.find_highest(find_highest542,17383 +function M.find_latest(546,17475 +function M.find_latest(find_latest546,17475 +function M.find_between(550,17565 +function M.find_between(find_between550,17565 +local function l_rangeCk(597,19046 +function M.isloaded(627,20231 +function M.isloaded(isloaded627,20231 +function M.isPending(659,21178 +function M.isPending(isPending659,21178 +function M.defaultKind(672,21527 +function M.defaultKind(defaultKind672,21527 +function M.prereq(687,21830 +function M.prereq(prereq687,21830 +function M.conflictCk(721,22731 +function M.conflictCk(conflictCk721,22731 +function M.downstreamConflictCk(747,23546 +function M.downstreamConflictCk(downstreamConflictCk747,23546 +function M.set_depends_on_flag(771,24257 +function M.set_depends_on_flag(set_depends_on_flag771,24257 +function M.get_depends_on_flag(782,24512 +function M.get_depends_on_flag(get_depends_on_flag782,24512 +function M.reset(787,24638 +function M.reset(reset787,24638 +function M.actionName(794,24774 +function M.actionName(actionName794,24774 +function M.show(802,24990 +function M.show(show802,24990 +function M.print(806,25057 +function M.print(print806,25057 src/MC_CheckSyntax.lua,162 function M.add_property(107,4627 @@ -1682,7 +1683,7 @@ function hide_version(70,2842 function hide_modulefile(77,3043 function hide(82,3211 -src/utils.lua,2010 +src/utils.lua,2011 function argsPack(76,2914 function __FILE__(82,3070 function __LINE__(86,3133 @@ -1694,53 +1695,53 @@ function build_i18n_messages(198,5837 function cmdDir(234,6855 function findLuaProg(241,7068 function colorizePropA(262,7808 -function expert(323,9739 -function extractFullName(330,9858 -function extractVersion(335,9999 -function findAdminFn(347,10329 -function readAdmin(364,10990 -function getMT(437,13198 -function getModuleRCT(465,13879 -function isMarked(518,15756 -function length(529,16054 -function optionTbl(538,16256 -function paired2pathT(544,16327 -function path2pathA(585,17466 -function quiet(629,18488 -function regular_cmp(636,18627 -function sanizatizeTbl(640,18680 -function setenv_lmod_version(675,19613 -function ShowCmdA(702,20381 -local function l_arg2str(718,20770 -function s_indent(740,21297 -function ShowCmdStr(748,21593 -function ShowHelpStr(800,22795 -function UUIDString(822,23379 -function case_independent_cmp(850,24223 -function activateWarning(867,24719 -function deactivateWarning(873,24891 -function haveWarnings(879,25069 -function setStatusFlag(885,25228 -function getStatusFlag(892,25417 -local function l_restoreEnv(896,25466 -local function l_runTCLprog(924,26028 -local function l_build_runTCLprog(944,26731 -function usingFastTCLInterp(958,27080 -local function l_build_accept_function(964,27317 -local function l_build_allow_dups_function(978,27614 -local function l_build_epoch_function(991,27904 -local function l_build_prepend_order_function(1026,28868 -function setSyntaxMode(1048,29391 -function checkSyntaxMode(1051,29454 -local function l_build_quarantineT(1057,29538 -function save_set_env(1070,29876 -function reset_env(1080,30094 -function initialize_lmod(1095,30423 -function tracing_msg(1160,32753 -function dynamic_shell(1174,33126 -function locatePkg(1223,34506 -function wrap_complete(1235,34739 -function unwrap_complete(1238,34809 +function expert(324,9772 +function extractFullName(331,9891 +function extractVersion(336,10032 +function findAdminFn(348,10362 +function readAdmin(365,11023 +function getMT(438,13231 +function getModuleRCT(466,13912 +function isMarked(519,15789 +function length(530,16087 +function optionTbl(539,16289 +function paired2pathT(545,16360 +function path2pathA(586,17499 +function quiet(630,18521 +function regular_cmp(637,18660 +function sanizatizeTbl(641,18713 +function setenv_lmod_version(676,19646 +function ShowCmdA(703,20414 +local function l_arg2str(719,20803 +function s_indent(741,21330 +function ShowCmdStr(749,21626 +function ShowHelpStr(801,22828 +function UUIDString(823,23412 +function case_independent_cmp(851,24256 +function activateWarning(868,24752 +function deactivateWarning(874,24924 +function haveWarnings(880,25102 +function setStatusFlag(886,25261 +function getStatusFlag(893,25450 +local function l_restoreEnv(897,25499 +local function l_runTCLprog(925,26061 +local function l_build_runTCLprog(945,26764 +function usingFastTCLInterp(959,27113 +local function l_build_accept_function(965,27350 +local function l_build_allow_dups_function(979,27647 +local function l_build_epoch_function(992,27937 +local function l_build_prepend_order_function(1027,28901 +function setSyntaxMode(1049,29424 +function checkSyntaxMode(1052,29487 +local function l_build_quarantineT(1058,29571 +function save_set_env(1071,29909 +function reset_env(1081,30127 +function initialize_lmod(1096,30456 +function tracing_msg(1161,32786 +function dynamic_shell(1175,33159 +function locatePkg(1224,34539 +function wrap_complete(1236,34772 +function unwrap_complete(1239,34842 src/cmdfuncs.lua,1144 local function l_Access(76,3264 @@ -1794,34 +1795,34 @@ function M.applyWeights(applyWeights258,8497 function M.__find_all_defaults(289,9505 function M.__find_all_defaults(__find_all_defaults289,9505 local function l_find_all_defaults_helper(296,9752 -function M.build_availA(367,12117 -function M.build_availA(build_availA367,12117 - local function l_build_availA_helper(372,12273 -function M.inherited_search(415,13731 -function M.inherited_search(inherited_search415,13731 - local function l_inherited_search_helper(418,13868 -function M.search(487,15956 -function M.search(search487,15956 -local function l_checkforNV(504,16429 -local function l_build_from_spiderT(513,16585 -function M.update(543,17633 -function M.update(update543,17633 -function M.__new(607,19831 -function M.__new(__new607,19831 -function M.moduleA(637,20680 -function M.moduleA(moduleA637,20680 -function M.isNVV(641,20735 -function M.isNVV(isNVV641,20735 -function M.spiderBuilt(645,20786 -function M.spiderBuilt(spiderBuilt645,20786 -function M.locationT(649,20849 -function M.locationT(locationT649,20849 -function M.defaultT(659,21065 -function M.defaultT(defaultT659,21065 -function M.singleton(671,21331 -function M.singleton(singleton671,21331 -function M.__clear(697,22070 -function M.__clear(__clear697,22070 +function M.build_availA(372,12371 +function M.build_availA(build_availA372,12371 + local function l_build_availA_helper(377,12527 +function M.inherited_search(428,14485 +function M.inherited_search(inherited_search428,14485 + local function l_inherited_search_helper(431,14622 +function M.search(500,16710 +function M.search(search500,16710 +local function l_checkforNV(517,17183 +local function l_build_from_spiderT(526,17339 +function M.update(556,18387 +function M.update(update556,18387 +function M.__new(620,20585 +function M.__new(__new620,20585 +function M.moduleA(650,21434 +function M.moduleA(moduleA650,21434 +function M.isNVV(654,21489 +function M.isNVV(isNVV654,21489 +function M.spiderBuilt(658,21540 +function M.spiderBuilt(spiderBuilt658,21540 +function M.locationT(662,21603 +function M.locationT(locationT662,21603 +function M.defaultT(672,21819 +function M.defaultT(defaultT672,21819 +function M.singleton(684,22085 +function M.singleton(singleton684,22085 +function M.__clear(710,22824 +function M.__clear(__clear710,22824 logos/2x/Lmod-black@2x.png,110 NKKvڵcO{C~}Ji(e8FB=_X4$ɡ9 }h<`AxZ߄fdtVzAxZ߄fdtV5,2308 @@ -1969,26 +1970,25 @@ init/ksh_funcs/ml,13 init/ksh_funcs/clearMT,18 clearMT(6,202 -init/bash.in,484 +init/bash.in,429 *v*x*) __lmod_vx=10,259 *v*) __lmod_vx=11,289 *x*) __lmod_vx=12,319 esac;13,349 __build_FPATH_for_zsh_ksh(26,681 - export __LMOD_SET_ZSH_FPATH=34,944 - export FPATH=44,1214 - export __LMOD_SET_KSH_FPATH=46,1312 - module(97,3060 - module(104,3267 -LMOD_VERSION=138,4310 - settarg 142,4406 -ml(158,4887 -clearMT(173,5233 -clearLmod(178,5304 -xSetTitleLmod(184,5403 - set -$__lmod_vx;$__lmod_vx200,5877 - unset __lmod_vx;201,5896 -fi;202,5915 + export FPATH=45,1155 +export LMOD_ROOT=51,1290 + module(96,2958 + module(103,3165 +LMOD_VERSION=137,4208 + settarg 141,4304 +ml(157,4785 +clearMT(172,5131 +clearLmod(177,5202 +xSetTitleLmod(183,5301 + set -$__lmod_vx;$__lmod_vx199,5775 + unset __lmod_vx;200,5794 +fi;201,5813 init/sh.in,43 LMOD_ROOT=3,11 @@ -7830,7 +7830,7 @@ AVAIL_MODS: bad;bad/1.0;bar;bar/3.4.5;foo;1,0 rt/modulerc/dot.modulerc,37 set modulepath_root $env(10,232 -rt/modulerc/out.txt,6287 +rt/modulerc/out.txt,6742 export LOADEDMODULES;10,291 __LMOD_REF_COUNT_MODULEPATH=11,313 export __LMOD_REF_COUNT_MODULEPATH;12,375 @@ -8057,6 +8057,21 @@ export _ModuleTable_;1371,63641 export MODULEPATH;1377,63835 _ModuleTable_=1378,63854 export _ModuleTable_;1379,64559 +unset LOADEDMODULES;1385,64730 +MODULEPATH=1386,64751 +export MODULEPATH;1387,64795 +unset _LMFILES_;1388,64814 +_ModuleTable_=1389,64831 +export _ModuleTable_;1390,64997 +export LOADEDMODULES;1396,65173 +__LMOD_REF_COUNT_MODULEPATH=1397,65195 +export __LMOD_REF_COUNT_MODULEPATH;1398,65258 +MODULEPATH=1399,65294 +export MODULEPATH;1400,65338 +_LMFILES_=1401,65357 +export _LMFILES_;1402,65412 +_ModuleTable_=1403,65430 +export _ModuleTable_;1404,65759 rt/modulerc/modulerc.tdesc,21 local testName 2,15 @@ -12181,7 +12196,7 @@ export _ModuleTable_;104,5189 rt/use_unuse/use_unuse.tdesc,19 testdescript 2,15 -rt/hidden/out.txt,1186 +rt/hidden/out.txt,1827 export __LMOD_REF_COUNT_MODULEPATH;10,327 MODULEPATH=11,363 export MODULEPATH;12,399 @@ -12194,40 +12209,65 @@ _LMFILES_=23,824 export _LMFILES_;24,871 _ModuleTable_=25,889 export _ModuleTable_;26,1215 -export MODULEPATH;32,1399 -_ModuleTable_=33,1418 -export _ModuleTable_;34,1744 -export MODULEPATH;40,1929 -_ModuleTable_=41,1948 -export _ModuleTable_;42,2274 -__LMOD_REF_COUNT_MODULEPATH=48,2455 -export __LMOD_REF_COUNT_MODULEPATH;49,2550 -MODULEPATH=50,2586 -export MODULEPATH;51,2659 -unset _LMFILES_;52,2678 -_ModuleTable_=53,2695 -export _ModuleTable_;54,2921 -export B;60,3080 -LOADEDMODULES=61,3090 -export LOADEDMODULES;62,3113 -MODULEPATH=63,3135 -export MODULEPATH;64,3208 -_LMFILES_=65,3227 -export _LMFILES_;66,3282 -_ModuleTable_=67,3300 -export _ModuleTable_;68,3705 -export A;74,3862 -LOADEDMODULES=75,3872 -export LOADEDMODULES;76,3901 -MODULEPATH=77,3923 -export MODULEPATH;78,3996 -_LMFILES_=79,4015 -export _LMFILES_;80,4109 -_ModuleTable_=81,4127 -export _ModuleTable_;82,4684 -export MODULEPATH;88,4905 -_ModuleTable_=89,4924 -export _ModuleTable_;90,5481 +export LOADEDMODULES;32,1398 +MODULEPATH=33,1420 +export MODULEPATH;34,1456 +_LMFILES_=35,1475 +export _LMFILES_;36,1556 +_ModuleTable_=37,1574 +export _ModuleTable_;38,2066 +export LOADEDMODULES;44,2257 +MODULEPATH=45,2279 +export MODULEPATH;46,2315 +_LMFILES_=47,2334 +export _LMFILES_;48,2450 +_ModuleTable_=49,2468 +export _ModuleTable_;50,3119 +export LOADEDMODULES;56,3313 +MODULEPATH=57,3335 +export MODULEPATH;58,3371 +_LMFILES_=59,3390 +export _LMFILES_;60,3539 +_ModuleTable_=61,3557 +export _ModuleTable_;62,4366 +export MODULEPATH;68,4550 +_ModuleTable_=69,4569 +export _ModuleTable_;70,5378 +export LOADEDMODULES;76,5550 +MODULEPATH=77,5572 +export MODULEPATH;78,5608 +_LMFILES_=79,5627 +export _LMFILES_;80,5674 +_ModuleTable_=81,5692 +export _ModuleTable_;82,6018 +__LMOD_REF_COUNT_MODULEPATH=88,6199 +export __LMOD_REF_COUNT_MODULEPATH;89,6294 +MODULEPATH=90,6330 +export MODULEPATH;91,6403 +unset _LMFILES_;92,6422 +_ModuleTable_=93,6439 +export _ModuleTable_;94,6665 +export B;100,6825 +LOADEDMODULES=101,6835 +export LOADEDMODULES;102,6858 +MODULEPATH=103,6880 +export MODULEPATH;104,6953 +_LMFILES_=105,6972 +export _LMFILES_;106,7027 +_ModuleTable_=107,7045 +export _ModuleTable_;108,7450 +export A;114,7608 +LOADEDMODULES=115,7618 +export LOADEDMODULES;116,7647 +MODULEPATH=117,7669 +export MODULEPATH;118,7742 +_LMFILES_=119,7761 +export _LMFILES_;120,7855 +_ModuleTable_=121,7873 +export _ModuleTable_;122,8430 +export MODULEPATH;128,8652 +_ModuleTable_=129,8671 +export _ModuleTable_;130,9228 rt/hidden/hidden.tdesc,21 local testName 2,15 @@ -14686,7 +14726,7 @@ export _ModuleTable_;14,594 rt/between/between.tdesc,21 local testName 2,15 -rt/between/out.txt,3060 +rt/between/out.txt,3335 export A_VERSION;10,275 B_VERSION=11,293 export B_VERSION;12,308 @@ -14803,6 +14843,16 @@ _LMFILES_=227,20889 export _LMFILES_;228,21054 _ModuleTable_=229,21072 export _ModuleTable_;230,21850 +export LOADEDMODULES;246,22322 +MODULEPATH=247,22344 +export MODULEPATH;248,22386 +_LMFILES_=249,22405 +export _LMFILES_;250,22687 +_ModuleTable_=251,22705 +export _ModuleTable_;252,23958 +export MODULEPATH;258,24149 +_ModuleTable_=259,24168 +export _ModuleTable_;260,25421 rt/restore_reset/out.txt,5384 export LOADEDMODULES;10,287 @@ -20130,6 +20180,22 @@ rt/between/mf/Core/Md.lua,0 rt/between/mf/Core/M2.lua,0 +rt/between/mf/Core/Me.lua,0 + +rt/between/mf/Core/e/1.2.lua,0 + +rt/between/mf/Core/e/1.4.lua,0 + +rt/between/mf/Core/e/1.5.lua,0 + +rt/between/mf/Core/e/1.1.lua,0 + +rt/between/mf/Core/e/1.0.lua,0 + +rt/between/mf/Core/e/1.3.lua,0 + +rt/between/mf/Core/e/.modulerc.lua,0 + rt/between/mf/Core/a/1.2.lua,0 rt/between/mf/Core/a/1.4.lua,0 @@ -20164,6 +20230,20 @@ rt/between/mf/Core/M5.lua,0 rt/between/mf/Core/Mc.lua,0 +rt/between/mf/Core/d/1.2.lua,0 + +rt/between/mf/Core/d/1.4.lua,0 + +rt/between/mf/Core/d/1.5.lua,0 + +rt/between/mf/Core/d/1.1.lua,0 + +rt/between/mf/Core/d/1.0.lua,0 + +rt/between/mf/Core/d/1.3.lua,0 + +rt/between/mf/Core/d/.modulerc.lua,0 + rt/between/mf/Core/b/1.2.lua,0 rt/between/mf/Core/b/1.4.lua,0 @@ -21444,10 +21524,16 @@ rt/hidden/mf2/bottom/B/9.8.7.lua,0 rt/hidden/err.txt,0 +rt/hidden/mf/.b/1.0.lua,0 + +rt/hidden/mf/.a/.1.lua,0 + rt/hidden/mf/lmod.lua,0 rt/hidden/mf/.system.lua,0 +rt/hidden/mf/c/.1.lua,0 + rt/use_unuse/err.txt,0 rt/use_unuse/mf/Core/a/1.0.lua,0 @@ -23350,6 +23436,16 @@ rt/modulerc/mf3/Core/cluster/1.0,0 rt/modulerc/mf2/Core/dummy/.2.0,0 +rt/modulerc/mfB/Core/ABC/3.0.lua,0 + +rt/modulerc/mfB/Core/ABC/4.0.lua,0 + +rt/modulerc/mfB/Core/ABC/2.0.lua,0 + +rt/modulerc/mfB/Core/ABC/1.0.lua,0 + +rt/modulerc/mfB/Core/ABC/.modulerc.lua,0 + rt/modulerc/mf8/compiler/intel/19.0.lua,0 rt/modulerc/mf8/compiler/intel/18.0.5.241.lua,0 diff --git a/init/bash.in b/init/bash.in index 39a581bee..5d6b17d11 100644 --- a/init/bash.in +++ b/init/bash.in @@ -25,7 +25,7 @@ fi __build_FPATH_for_zsh_ksh() { - (compinit -c 2> /dev/null) + (compinit -C 2> /dev/null) if [ "$?" != 0 ]; then zsh_fpath=$(unset FPATH; zsh -f -c 'echo $FPATH') fi diff --git a/rt/modulerc/modulerc.tdesc b/rt/modulerc/modulerc.tdesc index f3b10c012..a06fd52e0 100644 --- a/rt/modulerc/modulerc.tdesc +++ b/rt/modulerc/modulerc.tdesc @@ -154,6 +154,8 @@ EOF export MODULEPATH=$MODULEPATH_ROOT/Core runLmod load ABC #53 + runLmod list #54 + runLmod --show_hidden avail #55 HOME=$ORIG_HOME cat _stdout.[0-9][0-9][0-9] > _stdout.orig diff --git a/src/MName.lua b/src/MName.lua index f713cebf2..4999c5772 100644 --- a/src/MName.lua +++ b/src/MName.lua @@ -103,6 +103,7 @@ function M.new(self, sType, name, action, is, ie) o.__fn = false o.__versionStr = false o.__dependsOn = false + o.__moduleKindT = nil o.__ref_count = nil o.__depends_on_anyA = nil o.__sType = sType @@ -257,11 +258,12 @@ local function l_lazyEval(self) for i = 1, #stepA do local func = stepA[i] - found, fn, version, wV = func(self, fileA) + found, fn, version, wV, moduleKindT = func(self, fileA) if (found) then - self.__fn = fn - self.__version = version - self.__wV = wV + self.__fn = fn + self.__version = version + self.__wV = wV + self.__moduleKindT = moduleKindT if (self.__action == "latest" or self.__sn ~= self.__userName) then self.__userName = build_fullName(self.__sn, version) end @@ -269,7 +271,7 @@ local function l_lazyEval(self) end end --dbg.print{"l_lazyEval: sn: ",self.__sn, ", version: ",self.__version, ", fn: ",self.__fn,", wV: ",self.__wV,", userName: ",self.__userName,"\n"} - --dbg.print{"fn: ",self.__fn,"\n"} + --dbg.print{"fn: ",self.__fn,", kind: ",moduleKindT.kind,"\n"} --dbg.fini("l_lazyEval") end @@ -425,6 +427,7 @@ local function l_find_exact_match(self, must_have_version, fileA) local version = false local pV = " " -- this is less than the lowest possible weight local wV = false + local kind = false local found = false if (must_have_version and not versionStr) then return found, fn, version @@ -433,15 +436,17 @@ local function l_find_exact_match(self, must_have_version, fileA) for j = 1, #fileA do local blockA = fileA[j] for i = 1, #blockA do - local entry = blockA[i] - if (mrc:isVisible{fullName=entry.fullName,sn=entry.sn,fn=entry.fn, - visibleT = {soft = true, hidden = true}}) then + local entry = blockA[i] + local resultT = mrc:isVisible{fullName=entry.fullName,sn=entry.sn,fn=entry.fn, + visibleT = {soft = true, hidden = true}} + if (resultT.isVisible) then if (entry.version == versionStr and entry.pV > pV ) then - pV = entry.pV - wV = entry.wV - fn = entry.fn - version = entry.version or false - found = true + pV = entry.pV + wV = entry.wV + fn = entry.fn + version = entry.version or false + moduleKindT = resultT.moduleKindT + found = true self.__range = { pV, pV } break end @@ -449,9 +454,10 @@ local function l_find_exact_match(self, must_have_version, fileA) end end - dbg.print{"found: ",found,", fn: ",fn,", version: ", version,", wV: ",wV,"\n"} + dbg.print{"found: ",found,", fn: ",fn,", version: ", version,", wV: ",wV, + ", kind: ",moduleKindT.kind,"\n"} dbg.fini("MName l_find_exact_match") - return found, fn, version, wV + return found, fn, version, wV, moduleKindT end @@ -465,9 +471,9 @@ end function M.find_exact_match(self, fileA) dbg.start{"MName:find_exact_match(fileA)"} local must_have_version = true - local found, fn, version, wV = l_find_exact_match(self, must_have_version, fileA) + local found, fn, version, wV, moduleKindT = l_find_exact_match(self, must_have_version, fileA) dbg.fini("MName:find_exact_match") - return found, fn, version, wV + return found, fn, version, wV, moduleKindT end ------------------------------------------------------------------------ -- This routine is almost the same as M.find_exact_match @@ -478,37 +484,40 @@ end function M.find_exact_match_meta_module(self, fileA) dbg.start{"MName:find_exact_match_meta_module(fileA)"} local must_have_version = false - local found, fn, version, wV = l_find_exact_match(self, must_have_version, fileA) + local found, fn, version, wV, moduleKindT = l_find_exact_match(self, must_have_version, fileA) dbg.fini("MName:find_exact_match_meta_module") - return found, fn, version, wV + return found, fn, version, wV, moduleKindT end local function l_find_highest_by_key(self, key, fileA) dbg.start{"MName: l_find_highest_by_key(key:\"",key,"\",fileA)"} - local mrc = MRC:singleton() - local weight = " " -- this is less than the lower possible weight. - local idx = nil - local fn = false - local found = false - local version = false - local pV = false - local wV = false - fileA = fileA or {} + local mrc = MRC:singleton() + local weight = " " -- this is less than the lower possible weight. + local idx = nil + local fn = false + local moduleKindT = false + local found = false + local version = false + local pV = false + local wV = false + fileA = fileA or {} local blockA for j = 1,#fileA do blockA = fileA[j] for i = 1,#blockA do - local entry = blockA[i] - local v = entry[key] - if (isMarked(v) or mrc:isVisible{fullName=entry.fullName,sn=entry.sn,fn=entry.fn, - visibleT = {soft = true}}) then + local entry = blockA[i] + local v = entry[key] + local resultT = mrc:isVisible{fullName=entry.fullName,sn=entry.sn,fn=entry.fn, + visibleT = {soft = true}} + if (isMarked(v) or resultT.isVisible) then if (v > weight) then - idx = i - weight = v - pV = entry.pV - wV = entry.wV + idx = i + weight = v + pV = entry.pV + wV = entry.wV + moduleKindT = result.moduleKindT end end end @@ -520,9 +529,10 @@ local function l_find_highest_by_key(self, key, fileA) found = true self.__range = { pV, pV } end - dbg.print{"found: ",found,", fn: ",fn,", version: ", version,", wV: ",wV,"\n"} + dbg.print{"found: ",found,", fn: ",fn,", version: ", version,", wV: ",wV, + ", kind: ",moduleKindT.kind,"\n"} dbg.fini("MName: l_find_highest_by_key") - return found, fn, version, wV + return found, fn, version, wV, moduleKindT end ------------------------------------------------------------------------ @@ -544,27 +554,31 @@ function M.find_between(self, fileA) return x.pV < y.pV end) - local mrc = MRC:singleton() - local fn = false - local version = false - local lowerBound = self.__range[1] - local upperBound = self.__range[2] - local lowerFn = self.__range_fnA[1].func - local upperFn = self.__range_fnA[2].func - - local pV = lowerBound - local wV = " " -- this is less than the lower possible weight. - local idx = nil - local found = false + local mrc = MRC:singleton() + local fn = false + local version = false + local lowerBound = self.__range[1] + local upperBound = self.__range[2] + local lowerFn = self.__range_fnA[1].func + local upperFn = self.__range_fnA[2].func + + local pV = lowerBound + local wV = " " -- this is less than the lower possible weight. + local kind = nil + local idx = nil + local found = false + local moduleKindT = false for j = 1,#a do local entry = a[j] local v = entry.pV if (lowerFn(pV,v) and upperFn(v,upperBound) and entry.wV > wV) then - if (isMarked(v) or mrc:isVisible{fullName=entry.fullName,sn=entry.sn,fn=entry.fn, - visibleT = {soft = true}}) then - idx = j - pV = v - wV = entry.wV + local resultT = mrc:isVisible{fullName=entry.fullName,sn=entry.sn,fn=entry.fn, + visibleT = {soft = true}} + if (isMarked(v) or resultT.isVisible ) then + idx = j + pV = v + wV = entry.wV + moduleKindT = result.moduleKindT end end end @@ -577,7 +591,7 @@ function M.find_between(self, fileA) end end --dbg.fini("MName:find_between") - return found, fn, version, wV + return found, fn, version, wV, moduleKindT end local function l_rangeCk(self, version, result_if_found, result_if_not_found) diff --git a/src/MRC.lua b/src/MRC.lua index ea16b93ab..ddac140e8 100644 --- a/src/MRC.lua +++ b/src/MRC.lua @@ -460,6 +460,10 @@ local function l_findHiddenState(self, mpathA, sn, fullName, fn) end t = self.__hiddenT local resultT = t[sn] or t[fullName] or t[fn] + + ------------------------------------------------------------ + -- If there is no result for sn, fullName or fn + -- then check for partial matches for NVV modulefiles. if (not resultT) then local _ local n = fullName @@ -512,30 +516,45 @@ function M.isVisible(self, modT) local show_hidden = modT.show_hidden local isVisible = true local visibleT = modT.visibleT or {} - local hard = false + local resultT = l_findHiddenState(self, mpathA, sn, fullName, fn) + local kind = "normal" + local hidden_load = false + + ------------------------------------------------------------ + -- resultT is nil if the modulefile is normal or + -- {kind="hidden|soft|hard" + -- before="