package provides for the dynamic modification of a user’s environment via modulefiles.
| configure (modules-5.1.1.tar.bz2) | : | configure (modules-5.2.0.tar.bz2) |
|---|
| | |
| skipping to change at line 42 | | skipping to change at line 42 |
|---|
| setbinpath appendbinpath setmodulespath docinstall vimaddons \ | | setbinpath appendbinpath setmodulespath docinstall vimaddons \ |
| examplemodulefiles builddoc usemanpath libtclenvmodules SHLIB_SUFFIX \ | | examplemodulefiles builddoc usemanpath libtclenvmodules SHLIB_SUFFIX \ |
| multilibsupport libdir64 libdir32 versioning silentshdbgsupport \ | | multilibsupport libdir64 libdir32 versioning silentshdbgsupport \ |
| setshellstartup quarantinesupport autohandling availindepth implicitdefault \ | | setshellstartup quarantinesupport autohandling availindepth implicitdefault \ |
| extendeddefault moduleshome initconfin pager pageropts verbosity color \ | | extendeddefault moduleshome initconfin pager pageropts verbosity color \ |
| darkbgcolors lightbgcolors termbg lockedconfigs icase unloadmatchorder \ | | darkbgcolors lightbgcolors termbg lockedconfigs icase unloadmatchorder \ |
| searchmatch modulepath loadedmodules quarantinevars wa277 advversspec ml \ | | searchmatch modulepath loadedmodules quarantinevars wa277 advversspec ml \ |
| windowssupport nearlyforbiddendays implicitrequirement tagabbrev \ | | windowssupport nearlyforbiddendays implicitrequirement tagabbrev \ |
| tagcolorname mcookieversioncheck availoutput availterseoutput listoutput \ | | tagcolorname mcookieversioncheck availoutput availterseoutput listoutput \ |
| listterseoutput editor variantshortcut bashcompletiondir fishcompletiondir \ | | listterseoutput editor variantshortcut bashcompletiondir fishcompletiondir \ |
|
| zshcompletiondir" | | zshcompletiondir tcllinter tcllinteropts nagelfardatadir nagelfaraddons" |
| libarglist= | | libarglist=() |
| | |
| # flags to know if argument has been specified on command-line | | # flags to know if argument has been specified on command-line |
| defmodulespath=1 | | defmodulespath=1 |
| defpageropts=1 | | defpageropts=1 |
| | |
| # set argument default values | | # set argument default values |
| prefix=/usr/local/Modules | | prefix=/usr/local/Modules |
| setmanpath=y | | setmanpath=y |
| appendmanpath=n | | appendmanpath=n |
| setbinpath=y | | setbinpath=y |
| | |
| skipping to change at line 113 | | skipping to change at line 113 |
|---|
| # they will get their default value later (after command-line parse) | | # they will get their default value later (after command-line parse) |
| bindir= | | bindir= |
| libdir= | | libdir= |
| libexecdir= | | libexecdir= |
| etcdir= | | etcdir= |
| initdir= | | initdir= |
| datarootdir= | | datarootdir= |
| mandir= | | mandir= |
| docdir= | | docdir= |
| vimdatadir= | | vimdatadir= |
|
| | nagelfardatadir= |
| modulefilesdir= | | modulefilesdir= |
| moduleshome= | | moduleshome= |
| modulepath= | | modulepath= |
| windowssupport=n | | windowssupport=n |
| nearlyforbiddendays=14 | | nearlyforbiddendays=14 |
| tagabbrev='auto-loaded=aL:loaded=L:hidden=H:hidden-loaded=H:forbidden=F:nearly-f
orbidden=nF:sticky=S:super-sticky=sS:keep-loaded=kL' | | tagabbrev='auto-loaded=aL:loaded=L:hidden=H:hidden-loaded=H:forbidden=F:nearly-f
orbidden=nF:sticky=S:super-sticky=sS:keep-loaded=kL' |
| tagcolorname= | | tagcolorname= |
| mcookieversioncheck=y | | mcookieversioncheck=y |
| availoutput='modulepath:alias:dirwsym:sym:tag:key' | | availoutput='modulepath:alias:dirwsym:sym:tag:key' |
| availterseoutput='modulepath:alias:dirwsym:sym:tag' | | availterseoutput='modulepath:alias:dirwsym:sym:tag' |
| listoutput='header:idx:variant:sym:tag:key' | | listoutput='header:idx:variant:sym:tag:key' |
| listterseoutput='header' | | listterseoutput='header' |
| editor='vi' | | editor='vi' |
| variantshortcut= | | variantshortcut= |
| bashcompletiondir= | | bashcompletiondir= |
| fishcompletiondir= | | fishcompletiondir= |
| zshcompletiondir= | | zshcompletiondir= |
|
| | tcllinter='nagelfar.tcl' |
| | tcllinteropts= |
| | nagelfaraddons=y |
| | |
| # check if output/error channels are attached to terminal | | # check if output/error channels are attached to terminal |
| for i in 1 2; do | | for i in 1 2; do |
| if [ -t $i ]; then | | if [ -t $i ]; then |
| fdisterm[$i]=1 | | fdisterm[$i]=1 |
| else | | else |
| fdisterm[$i]=0 | | fdisterm[$i]=0 |
| fi | | fi |
| done | | done |
| | |
| # apply SGR code to message if output channel is attached to terminal | | # apply SGR code to message if output channel is attached to terminal |
| sgr() { | | sgr() { |
| local fd=$1 | | local fd=$1 |
| local code=$2 | | local code=$2 |
| local msg=$3 | | local msg=$3 |
| if [ ${fdisterm[$fd]} -eq 1 ]; then | | if [ ${fdisterm[$fd]} -eq 1 ]; then |
| local out="\033[${code}m${msg}\033[0m" | | local out="\033[${code}m${msg}\033[0m" |
| else | | else |
| local out=$msg | | local out=$msg |
| fi | | fi |
|
| echo $out | | echo "$out" |
| } | | } |
| | |
| # print message on stderr then exit | | # print message on stderr then exit |
| echo_error() { | | echo_error() { |
| local firstln=1 | | local firstln=1 |
| while [ $# -gt 0 ]; do | | while [ $# -gt 0 ]; do |
| if [ $firstln -eq 1 ]; then | | if [ $firstln -eq 1 ]; then |
|
| local msg="$(sgr 2 31 ERROR): $1" | | local msg |
| | msg="$(sgr 2 31 ERROR): $1" |
| firstln=0 | | firstln=0 |
| elif [ "$1" = 'tryhelp' ]; then | | elif [ "$1" = 'tryhelp' ]; then |
| msg="${msg}\n Try \`$progpath --help' for more information" | | msg="${msg}\n Try \`$progpath --help' for more information" |
| else | | else |
| msg="${msg}\n $1" | | msg="${msg}\n $1" |
| fi | | fi |
| shift | | shift |
| done | | done |
| echo -e "${msg}" >&2 | | echo -e "${msg}" >&2 |
| exit 1 | | exit 1 |
| | |
| skipping to change at line 206 | | skipping to change at line 211 |
|---|
| Fine tuning of the installation directories: | | Fine tuning of the installation directories: |
| --bindir=DIR user executables [PREFIX/bin] | | --bindir=DIR user executables [PREFIX/bin] |
| --libdir=DIR object code libraries [PREFIX/lib] | | --libdir=DIR object code libraries [PREFIX/lib] |
| --libexecdir=DIR program executables [PREFIX/libexec] | | --libexecdir=DIR program executables [PREFIX/libexec] |
| --etcdir=DIR program configurations [PREFIX/etc] | | --etcdir=DIR program configurations [PREFIX/etc] |
| --initdir=DIR environment initialization scripts [PREFIX/init] | | --initdir=DIR environment initialization scripts [PREFIX/init] |
| --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] | | --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] |
| --mandir=DIR man documentation [DATAROOTDIR/man] | | --mandir=DIR man documentation [DATAROOTDIR/man] |
| --docdir=DIR documentation root [DATAROOTDIR/doc] | | --docdir=DIR documentation root [DATAROOTDIR/doc] |
| --vimdatadir=DIR Vim addons directory [DATAROOTDIR/vim/vimfiles] | | --vimdatadir=DIR Vim addons directory [DATAROOTDIR/vim/vimfiles] |
|
| | --nagelfardatadir=DIR Nagelfar addons directory [DATAROOTDIR/nagelfar] |
| --modulefilesdir=DIR system modulefiles [PREFIX/modulefiles] | | --modulefilesdir=DIR system modulefiles [PREFIX/modulefiles] |
| | |
| Optional Features: | | Optional Features: |
| --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) |
| --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] |
| --enable-set-manpath set mandir to MANPATH in init scripts [yes] | | --enable-set-manpath set mandir to MANPATH in init scripts [yes] |
| --enable-append-manpath append rather prepend mandir to MANPATH [no] | | --enable-append-manpath append rather prepend mandir to MANPATH [no] |
| --enable-set-binpath set bindir to PATH in init scripts [yes] | | --enable-set-binpath set bindir to PATH in init scripts [yes] |
| --enable-append-binpath append rather prepend bindir to PATH [no] | | --enable-append-binpath append rather prepend bindir to PATH [no] |
| --enable-modulespath, --enable-dotmodulespath | | --enable-modulespath, --enable-dotmodulespath |
| configure modules path in modulespath file rather | | configure modules path in modulespath file rather |
| than initrc file (or respectively in .modulespath | | than initrc file (or respectively in .modulespath |
| file rather modulerc file if \`--with-initconf-in' | | file rather modulerc file if \`--with-initconf-in' |
| is set to 'initdir') [no] | | is set to 'initdir') [no] |
| --enable-doc-install install documentation files in the documentation | | --enable-doc-install install documentation files in the documentation |
| directory defined with \'docdir' (no impact on | | directory defined with \'docdir' (no impact on |
| man pages installation) [yes] | | man pages installation) [yes] |
| --enable-vim-addons install Vim addon files in the directory defined | | --enable-vim-addons install Vim addon files in the directory defined |
| with \'vimdatadir' [yes] | | with \'vimdatadir' [yes] |
|
| | --enable-nagelfar-addons |
| | install Nagelfar addon files in the directory |
| | defined with \'nagelfardatadir' [yes] |
| --enable-example-modulefiles | | --enable-example-modulefiles |
| install in 'modulefilesdir' some modulefiles | | install in 'modulefilesdir' some modulefiles |
| provided as examples [yes] | | provided as examples [yes] |
| --enable-libtclenvmodules | | --enable-libtclenvmodules |
| build and install the Modules Tcl extension library | | build and install the Modules Tcl extension library |
| and enable its load in modulecmd.tcl [yes] | | and enable its load in modulecmd.tcl [yes] |
| --enable-multilib-support | | --enable-multilib-support |
| support multilib systems by looking at an alternative | | support multilib systems by looking at an alternative |
| location where to find the Modules Tcl extension lib | | location where to find the Modules Tcl extension lib |
| depending on current machine architecture. [no] | | depending on current machine architecture. [no] |
| | |
| skipping to change at line 419 | | skipping to change at line 428 |
|---|
| tclConfig.sh. | | tclConfig.sh. |
| --with-tclinclude directory containing the Tcl header files. | | --with-tclinclude directory containing the Tcl header files. |
| --with-python=BIN name or full path of Python interpreter command to | | --with-python=BIN name or full path of Python interpreter command to |
| use as shebang for helper scripts [$PYTHON] | | use as shebang for helper scripts [$PYTHON] |
| --with-bashcompletiondir=DIR | | --with-bashcompletiondir=DIR |
| Bash completions directory [] | | Bash completions directory [] |
| --with-fishcompletiondir=DIR | | --with-fishcompletiondir=DIR |
| Fish completions directory [] | | Fish completions directory [] |
| --with-zshcompletiondir=DIR | | --with-zshcompletiondir=DIR |
| Zsh completions directory [] | | Zsh completions directory [] |
|
| | --with-tcl-linter=BIN name of full path of program to use to lint Tcl |
| | modulefiles [$tcllinter] |
| | --with-tcl-linter-opts=OPTLIST |
| | settings to apply to tcl linter program [$pageropts] |
| | |
| Depending on the above configuration options the files are approximately | | Depending on the above configuration options the files are approximately |
| placed in the following directory structure: | | placed in the following directory structure: |
| PREFIX/ | | PREFIX/ |
| bin/ | | bin/ |
| etc/ | | etc/ |
| init/ | | init/ |
| lib/ | | lib/ |
| libexec/ | | libexec/ |
| share/ | | share/ |
| doc/ | | doc/ |
| man/ | | man/ |
| man1/ | | man1/ |
| man4/ | | man4/ |
|
| | nagelfar/ |
| vim/ | | vim/ |
| vimfiles/ | | vimfiles/ |
| modulefiles/" | | modulefiles/" |
| } | | } |
| | |
| # check requirement availability | | # check requirement availability |
| check_requirement() { | | check_requirement() { |
| typeset req=$1 | | typeset req=$1 |
| typeset optmesg=$2 | | typeset optmesg=$2 |
| typeset cmdenv=$3 | | typeset cmdenv=$3 |
| | |
| skipping to change at line 458 | | skipping to change at line 472 |
|---|
| fi | | fi |
| | |
| for cmd in $req "${@}"; do | | for cmd in $req "${@}"; do |
| if [ -n "$cmd" ]; then | | if [ -n "$cmd" ]; then |
| echo -n "checking for ${cmd}... " | | echo -n "checking for ${cmd}... " |
| if [ -n "$cmdenv" ]; then | | if [ -n "$cmdenv" ]; then |
| cmdsearch="$cmdenv command -v $cmd" | | cmdsearch="$cmdenv command -v $cmd" |
| else | | else |
| cmdsearch="command -v $cmd" | | cmdsearch="command -v $cmd" |
| fi | | fi |
|
| reqpath=$(eval $cmdsearch) | | reqpath=$(eval "$cmdsearch") |
| if [ -n "$reqpath" ]; then | | if [ -n "$reqpath" ]; then |
|
| echo $reqpath | | echo "$reqpath" |
| break | | break |
| else | | else |
| echo "not found" | | echo "not found" |
| fi | | fi |
| fi | | fi |
| done | | done |
| | |
| if [ -z "$reqpath" ]; then | | if [ -z "$reqpath" ]; then |
| if [ -z "$optmesg" ]; then | | if [ -z "$optmesg" ]; then |
| echo_error "$req could not be found" | | echo_error "$req could not be found" |
| | |
| skipping to change at line 514 | | skipping to change at line 528 |
|---|
| fi | | fi |
| else | | else |
| echo "$valifunset" | | echo "$valifunset" |
| fi | | fi |
| } | | } |
| | |
| # parse arguments | | # parse arguments |
| for arg in "$@"; do | | for arg in "$@"; do |
| # set argument value defined with "--arg val" form | | # set argument value defined with "--arg val" form |
| if [ -n "${nextargisval+x}" ]; then | | if [ -n "${nextargisval+x}" ]; then |
|
| declare $nextargisval=$arg | | declare "$nextargisval"="$arg" |
| unset nextargisval | | unset nextargisval |
| continue | | continue |
| # set lib argument value defined with "--arg val" form | | # set lib argument value defined with "--arg val" form |
| elif [ -n "${nextargislibarg+x}" ]; then | | elif [ -n "${nextargislibarg+x}" ]; then |
|
| libarglist+="$arg " ; | | libarglist+=("$arg"); |
| unset nextargislibarg | | unset nextargislibarg |
| continue | | continue |
| # current arg should be skipped | | # current arg should be skipped |
| elif [ -n "${nextargisign+x}" ]; then | | elif [ -n "${nextargisign+x}" ]; then |
| unset nextargisign | | unset nextargisign |
| continue | | continue |
| fi | | fi |
| | |
| case "$arg" in | | case "$arg" in |
| --prefix=*) | | --prefix=*) |
| | |
| skipping to change at line 569 | | skipping to change at line 583 |
|---|
| --mandir) | | --mandir) |
| nextargisval=mandir ;; | | nextargisval=mandir ;; |
| --docdir=*) | | --docdir=*) |
| docdir="${arg#*=}" ;; | | docdir="${arg#*=}" ;; |
| --docdir) | | --docdir) |
| nextargisval=docdir ;; | | nextargisval=docdir ;; |
| --vimdatadir=*) | | --vimdatadir=*) |
| vimdatadir="${arg#*=}" ;; | | vimdatadir="${arg#*=}" ;; |
| --vimdatadir) | | --vimdatadir) |
| nextargisval=vimdatadir ;; | | nextargisval=vimdatadir ;; |
|
| | --nagelfardatadir=*) |
| | nagelfardatadir="${arg#*=}" ;; |
| | --nagelfardatadir) |
| | nextargisval=nagelfardatadir ;; |
| --modulefilesdir=*) | | --modulefilesdir=*) |
| modulefilesdir="${arg#*=}" ;; | | modulefilesdir="${arg#*=}" ;; |
| --modulefilesdir) | | --modulefilesdir) |
| nextargisval=modulefilesdir ;; | | nextargisval=modulefilesdir ;; |
| --enable-set-manpath*|--disable-set-manpath) | | --enable-set-manpath*|--disable-set-manpath) |
| setmanpath=$(get_feature_value "$arg") ;; | | setmanpath=$(get_feature_value "$arg") ;; |
| --enable-append-manpath*|--disable-append-manpath) | | --enable-append-manpath*|--disable-append-manpath) |
| appendmanpath=$(get_feature_value "$arg") ;; | | appendmanpath=$(get_feature_value "$arg") ;; |
| --enable-set-binpath*|--disable-set-binpath) | | --enable-set-binpath*|--disable-set-binpath) |
| setbinpath=$(get_feature_value "$arg") ;; | | setbinpath=$(get_feature_value "$arg") ;; |
| | |
| skipping to change at line 590 | | skipping to change at line 608 |
|---|
| appendbinpath=$(get_feature_value "$arg") ;; | | appendbinpath=$(get_feature_value "$arg") ;; |
| --enable-dotmodulespath*|--disable-dotmodulespath|--enable-modulespath*|--dis
able-modulespath) | | --enable-dotmodulespath*|--disable-dotmodulespath|--enable-modulespath*|--dis
able-modulespath) |
| setmodulespath=$(get_feature_value "$arg") | | setmodulespath=$(get_feature_value "$arg") |
| defmodulespath=0 ;; | | defmodulespath=0 ;; |
| --enable-doc-install*|--disable-doc-install) | | --enable-doc-install*|--disable-doc-install) |
| docinstall=$(get_feature_value "$arg") | | docinstall=$(get_feature_value "$arg") |
| defdocinstall=0 ;; | | defdocinstall=0 ;; |
| --enable-vim-addons*|--disable-vim-addons) | | --enable-vim-addons*|--disable-vim-addons) |
| vimaddons=$(get_feature_value "$arg") | | vimaddons=$(get_feature_value "$arg") |
| defvimplugin=0 ;; | | defvimplugin=0 ;; |
|
| | --enable-nagelfar-addons*|--disable-nagelfar-addons) |
| | nagelfaraddons=$(get_feature_value "$arg") ;; |
| --enable-example-modulefiles*|--disable-example-modulefiles) | | --enable-example-modulefiles*|--disable-example-modulefiles) |
| examplemodulefiles=$(get_feature_value "$arg") | | examplemodulefiles=$(get_feature_value "$arg") |
| defexamplemodulefiles=0 ;; | | defexamplemodulefiles=0 ;; |
| --enable-libtclenvmodules*|--disable-libtclenvmodules) | | --enable-libtclenvmodules*|--disable-libtclenvmodules) |
| libtclenvmodules=$(get_feature_value "$arg") ;; | | libtclenvmodules=$(get_feature_value "$arg") ;; |
| --enable-multilib-support*|--disable-multilib-support) | | --enable-multilib-support*|--disable-multilib-support) |
| multilibsupport=$(get_feature_value "$arg") ;; | | multilibsupport=$(get_feature_value "$arg") ;; |
| --enable-versioning*|--disable-versioning) | | --enable-versioning*|--disable-versioning) |
| versioning=$(get_feature_value "$arg") ;; | | versioning=$(get_feature_value "$arg") ;; |
| --enable-silent-shell-debug-support*|--disable-silent-shell-debug-support) | | --enable-silent-shell-debug-support*|--disable-silent-shell-debug-support) |
| | |
| skipping to change at line 773 | | skipping to change at line 793 |
|---|
| --with-loadedmodules=*|--without-loadedmodules) | | --with-loadedmodules=*|--without-loadedmodules) |
| loadedmodules=$(get_package_value "$arg") ;; | | loadedmodules=$(get_package_value "$arg") ;; |
| --with-quarantine-vars=*|--without-quarantine-vars) | | --with-quarantine-vars=*|--without-quarantine-vars) |
| quarantinevars=$(get_package_value "$arg") ;; | | quarantinevars=$(get_package_value "$arg") ;; |
| --with-bashcompletiondir=*|--without-bashcompletiondir) | | --with-bashcompletiondir=*|--without-bashcompletiondir) |
| bashcompletiondir=$(get_package_value "$arg" "") ;; | | bashcompletiondir=$(get_package_value "$arg" "") ;; |
| --with-fishcompletiondir=*|--without-fishcompletiondir) | | --with-fishcompletiondir=*|--without-fishcompletiondir) |
| fishcompletiondir=$(get_package_value "$arg" "") ;; | | fishcompletiondir=$(get_package_value "$arg" "") ;; |
| --with-zshcompletiondir=*|--without-zshcompletiondir) | | --with-zshcompletiondir=*|--without-zshcompletiondir) |
| zshcompletiondir=$(get_package_value "$arg" "") ;; | | zshcompletiondir=$(get_package_value "$arg" "") ;; |
|
| | --with-tcl-linter=*|--without-tcl-linter) |
| | tcllinter=$(get_package_value "$arg") ;; |
| | --with-tcl-linter-opts=*|--without-tcl-linter-opts) |
| | tcllinteropts=$(get_package_value "$arg") ;; |
| --with-tcl=*|--without-tcl|--with-tclinclude=*|--without-tclinclude) | | --with-tcl=*|--without-tcl|--with-tclinclude=*|--without-tclinclude) |
|
| libarglist+="$arg " ;; | | libarglist+=("$arg") ;; |
| --with-python=*|--without-python) | | --with-python=*|--without-python) |
| pythonbin=$(get_package_value "$arg") ;; | | pythonbin=$(get_package_value "$arg") ;; |
| --with-module-path=*) | | --with-module-path=*) |
| echo_warning "Option \`--with-module-path' ignored, use \`--modulepath' in
stead" ;; | | echo_warning "Option \`--with-module-path' ignored, use \`--modulepath' in
stead" ;; |
| -h|--help) | | -h|--help) |
| echo_usage | | echo_usage |
| exit 0 | | exit 0 |
| ;; | | ;; |
| --build|--host|--target) | | --build|--host|--target) |
| # pass argument supported by lib to its ./configure script | | # pass argument supported by lib to its ./configure script |
|
| libarglist+="$arg " ; | | libarglist+=("$arg") ; |
| # and set next arg should also be send to lib script | | # and set next arg should also be send to lib script |
| nextargislibarg=y ;; | | nextargislibarg=y ;; |
| --build=*|--host=*|--target=*) | | --build=*|--host=*|--target=*) |
| # pass argument supported by lib to its ./configure script | | # pass argument supported by lib to its ./configure script |
|
| libarglist+="$arg " ;; | | libarglist+=("$arg") ;; |
| --program-prefix|--program-suffix|--program-transform-name|--exec-prefix|\ | | --program-prefix|--program-suffix|--program-transform-name|--exec-prefix|\ |
| --sbindir|--sysconfdir|--datadir|--includedir|--localstatedir|\ | | --sbindir|--sysconfdir|--datadir|--includedir|--localstatedir|\ |
| --sharedstatedir|--infodir|--runstatedir|--oldincludedir|--localedir|\ | | --sharedstatedir|--infodir|--runstatedir|--oldincludedir|--localedir|\ |
| --htmldir|--dvidir|--pdfdir|--psdir) | | --htmldir|--dvidir|--pdfdir|--psdir) |
| # ignore standard configure option and value which has no meaning here | | # ignore standard configure option and value which has no meaning here |
| echo_warning "Option \`$arg' ignored" ; | | echo_warning "Option \`$arg' ignored" ; |
| nextargisign=y ;; | | nextargisign=y ;; |
| --program-prefix=*|--program-suffix=*|--program-transform-name=*|\ | | --program-prefix=*|--program-suffix=*|--program-transform-name=*|\ |
| --exec-prefix=*|--sbindir=*|--sysconfdir=*|--datadir=*|--includedir=*|\ | | --exec-prefix=*|--sbindir=*|--sysconfdir=*|--datadir=*|--includedir=*|\ |
| --localstatedir=*|--sharedstatedir=*|--infodir=*|--runstatedir=*|\ | | --localstatedir=*|--sharedstatedir=*|--infodir=*|--runstatedir=*|\ |
| | |
| skipping to change at line 814 | | skipping to change at line 838 |
|---|
| echo_warning "Option \`$arg' ignored" ;; | | echo_warning "Option \`$arg' ignored" ;; |
| --enable-*|--disable-*|--with-*|--without-*) | | --enable-*|--disable-*|--with-*|--without-*) |
| # ignore --enable-*/--with-* options not supported here to comply with | | # ignore --enable-*/--with-* options not supported here to comply with |
| # GNU Configuration specification | | # GNU Configuration specification |
| # (https://www.gnu.org/prep/standards/html_node/Configuration.html) | | # (https://www.gnu.org/prep/standards/html_node/Configuration.html) |
| echo_warning "Option \`$arg' ignored" ;; | | echo_warning "Option \`$arg' ignored" ;; |
| -*) | | -*) |
| echo_error "Unrecognized option \`$arg'" tryhelp;; | | echo_error "Unrecognized option \`$arg'" tryhelp;; |
| *=*) | | *=*) |
| echo -e "Export \`$arg' in environment" ; | | echo -e "Export \`$arg' in environment" ; |
|
| export $arg ;; | | export "${arg?}" ;; |
| *) | | *) |
| # type of system to build the program for (not needed here but useful | | # type of system to build the program for (not needed here but useful |
| # for true autoconf configure script below | | # for true autoconf configure script below |
|
| libarglist+="$arg " ;; | | libarglist+=("$arg") ;; |
| esac | | esac |
| done | | done |
| | |
| # test requirements availability | | # test requirements availability |
| check_requirement uname | | check_requirement uname |
| kernelname=$(uname -s) | | kernelname=$(uname -s) |
| | |
| # Makefile for this project are GNU Makefile so we must ensure correct make | | # Makefile for this project are GNU Makefile so we must ensure correct make |
| # command is available, on Linux/Darwin systems the 'make' bin refers to GNU | | # command is available, on Linux/Darwin systems the 'make' bin refers to GNU |
| # Make whereas on other system it is not the default make flavor, so 'gmake' | | # Make whereas on other system it is not the default make flavor, so 'gmake' |
| | |
| skipping to change at line 879 | | skipping to change at line 903 |
|---|
| # pass even if sphinx not there but no doc will be built | | # pass even if sphinx not there but no doc will be built |
| check_requirement sphinx-build "Install \`sphinx-build' if you want to \ | | check_requirement sphinx-build "Install \`sphinx-build' if you want to \ |
| build the documentation" '' 'sphinx-1.0-build' | | build the documentation" '' 'sphinx-1.0-build' |
| SPHINXBUILD=$reqpath | | SPHINXBUILD=$reqpath |
| [ -z "$reqpath" ] && builddoc=n | | [ -z "$reqpath" ] && builddoc=n |
| fi | | fi |
| | |
| # get tclsh location from standard PATHs or /usr/local/bin | | # get tclsh location from standard PATHs or /usr/local/bin |
| # or validate location passed as argument | | # or validate location passed as argument |
| if [ -n "$tclshbin" ]; then | | if [ -n "$tclshbin" ]; then |
|
| check_requirement $tclshbin '' "PATH=$binsearchpath" | | check_requirement "$tclshbin" '' "PATH=$binsearchpath" |
| else | | else |
| # also check version-specific names in case no generic tclsh binary exists | | # also check version-specific names in case no generic tclsh binary exists |
| check_requirement $TCLSH '' "PATH=$binsearchpath" 'tclsh8.6' 'tclsh8.5' 'tcls
h8.4' | | check_requirement $TCLSH '' "PATH=$binsearchpath" 'tclsh8.6' 'tclsh8.5' 'tcls
h8.4' |
| fi | | fi |
| TCLSH=$reqpath | | TCLSH=$reqpath |
| | |
| # python is mandatory if installing from git repository to build ChangeLog | | # python is mandatory if installing from git repository to build ChangeLog |
| if [ -e '.git' ]; then | | if [ -e '.git' ]; then |
| missmsg='' | | missmsg='' |
| elif [ -n "$pythonbin" ]; then | | elif [ -n "$pythonbin" ]; then |
| missmsg="Specified Python command \`$pythonbin' cannot be found" | | missmsg="Specified Python command \`$pythonbin' cannot be found" |
| else | | else |
| missmsg='-' | | missmsg='-' |
| fi | | fi |
| # only look at --with-python specification if set | | # only look at --with-python specification if set |
| if [ -n "$pythonbin" ]; then | | if [ -n "$pythonbin" ]; then |
|
| check_requirement $pythonbin "$missmsg" "PATH=$binsearchpath" | | check_requirement "$pythonbin" "$missmsg" "PATH=$binsearchpath" |
| else | | else |
| check_requirement $PYTHON "$missmsg" "PATH=$binsearchpath" 'python3' 'python2
' | | check_requirement $PYTHON "$missmsg" "PATH=$binsearchpath" 'python3' 'python2
' |
| fi | | fi |
| # define a generic launching name if command not found at build time | | # define a generic launching name if command not found at build time |
| if [ -z "$reqpath" ]; then | | if [ -z "$reqpath" ]; then |
| # use --with-python specification if set | | # use --with-python specification if set |
| if [ "${pythonbin:0:1}" = '/' ]; then | | if [ "${pythonbin:0:1}" = '/' ]; then |
| PYTHON="$pythonbin" | | PYTHON="$pythonbin" |
| elif [ -n "$pythonbin" ]; then | | elif [ -n "$pythonbin" ]; then |
| PYTHON="/usr/bin/env $pythonbin" | | PYTHON="/usr/bin/env $pythonbin" |
| | |
| skipping to change at line 923 | | skipping to change at line 947 |
|---|
| | |
| # get location of commands used 'fullpath' in init scripts | | # get location of commands used 'fullpath' in init scripts |
| check_requirement 'ps' '' "PATH=$binsearchpath" | | check_requirement 'ps' '' "PATH=$binsearchpath" |
| PS=$reqpath | | PS=$reqpath |
| check_requirement 'basename' '' "PATH=$binsearchpath" | | check_requirement 'basename' '' "PATH=$binsearchpath" |
| BASENAME=$reqpath | | BASENAME=$reqpath |
| | |
| # get pager program location from standard PATHs or /usr/local/bin | | # get pager program location from standard PATHs or /usr/local/bin |
| # or validate location passed as argument | | # or validate location passed as argument |
| if [ -n "$pager" ]; then | | if [ -n "$pager" ]; then |
|
| check_requirement $pager '' "PATH=$binsearchpath" | | check_requirement "$pager" '' "PATH=$binsearchpath" |
| pager=$reqpath | | pager=$reqpath |
| fi | | fi |
| # adapt pager program settings dependings of specified args | | # adapt pager program settings dependings of specified args |
|
| if [ $defpageropts -eq 1 -a "${pager##*/}" != 'less' ]; then | | if [ $defpageropts -eq 1 ] && [ "${pager##*/}" != 'less' ]; then |
| pageropts='' | | pageropts='' |
| echo_warning "As chosen pager is not \`less', default pager options are clea
red" | | echo_warning "As chosen pager is not \`less', default pager options are clea
red" |
| fi | | fi |
| | |
|
| | if [ -n "$tcllinter" ]; then |
| | check_requirement "$tcllinter" "$tcllinter could not be found" "PATH=$binsear |
| | chpath" |
| | if [ -n "$reqpath" ]; then |
| | tcllinter=$reqpath |
| | fi |
| | fi |
| | |
| # fetch modules version from version.inc.in file (which may be raw data to | | # fetch modules version from version.inc.in file (which may be raw data to |
| # refine or exact values if dist has been built by `git archive`) | | # refine or exact values if dist has been built by `git archive`) |
|
| if [ -r ${progdir}/version.inc.in ]; then | | if [ -r "${progdir}/version.inc.in" ]; then |
| release=$(sed -n '/^MODULES_RELEASE/{s/.*= //p;q;}' ${progdir}/version.inc.in) | | release=$(sed -n '/^MODULES_RELEASE/{s/.*= //p;q;}' \ |
| | "${progdir}/version.inc.in") |
| build_hash=$(sed -n '/^MODULES_BUILD_HASH/{s/.*= //p;q;}' \ | | build_hash=$(sed -n '/^MODULES_BUILD_HASH/{s/.*= //p;q;}' \ |
|
| ${progdir}/version.inc.in) | | "${progdir}/version.inc.in") |
| build_refs=$(sed -n '/^MODULES_BUILD_REFS/{s/.*= //p;q;}' \ | | build_refs=$(sed -n '/^MODULES_BUILD_REFS/{s/.*= //p;q;}' \ |
|
| ${progdir}/version.inc.in) | | "${progdir}/version.inc.in") |
| build_refs=${build_refs//,} | | build_refs=${build_refs//,} |
| build_refs=${build_refs//origin\/} | | build_refs=${build_refs//origin\/} |
| else | | else |
| echo_error "${progdir}/version.inc.in is missing" | | echo_error "${progdir}/version.inc.in is missing" |
| fi | | fi |
| | |
| # refine build number if working from git repository | | # refine build number if working from git repository |
| if [ -e '.git' ]; then | | if [ -e '.git' ]; then |
| gitcurtag=$(git describe --tags --abbrev=0) | | gitcurtag=$(git describe --tags --abbrev=0) |
| gitcurdesc=$(git describe --tags) | | gitcurdesc=$(git describe --tags) |
| gitcurbranch=$(git rev-parse --abbrev-ref HEAD) | | gitcurbranch=$(git rev-parse --abbrev-ref HEAD) |
| if [ "$gitcurtag" = "$gitcurdesc" ]; then | | if [ "$gitcurtag" = "$gitcurdesc" ]; then |
| build='' | | build='' |
|
| elif [ "$gitcurbranch" = 'master' ]; then | | elif [ "$gitcurbranch" = 'main' ]; then |
| build="+${gitcurdesc#${gitcurtag}-}" | | build="+${gitcurdesc#${gitcurtag}-}" |
| else | | else |
| build="+${gitcurbranch}${gitcurdesc#${gitcurtag}}" | | build="+${gitcurbranch}${gitcurdesc#${gitcurtag}}" |
| fi | | fi |
| # set a recognizable build number if one found in version.inc.in is raw data | | # set a recognizable build number if one found in version.inc.in is raw data |
| elif [ "$build_hash" = '$Format:%h' ]; then | | elif [ "$build_hash" = '$Format:%h' ]; then |
| build='+XX-gffffffff' | | build='+XX-gffffffff' |
| # or compute it from these information as if working from git repository | | # or compute it from these information as if working from git repository |
| elif [[ " $build_refs " =~ " v$release " ]]; then | | elif [[ " $build_refs " =~ " v$release " ]]; then |
| build='' | | build='' |
|
| elif [[ " $build_refs " =~ " master " ]]; then | | elif [[ " $build_refs " =~ " main " ]]; then |
| build="+XX-g$build_hash" | | build="+XX-g$build_hash" |
| # %D placeholder may not be known by old version of git | | # %D placeholder may not be known by old version of git |
| elif [ "$build_refs" = "%D" ]; then | | elif [ "$build_refs" = "%D" ]; then |
| build="+XX-g$build_hash" | | build="+XX-g$build_hash" |
| else | | else |
| build="+${build_refs##* }-XX-g$build_hash" | | build="+${build_refs##* }-XX-g$build_hash" |
| fi | | fi |
| VERSION=$release$build | | VERSION=$release$build |
| RELEASE=$release | | RELEASE=$release |
| | |
| | |
| skipping to change at line 1003 | | skipping to change at line 1035 |
|---|
| # set argument default values for those depending of other argument | | # set argument default values for those depending of other argument |
| [ -z "$bindir" ] && bindir=$prefix/bin | | [ -z "$bindir" ] && bindir=$prefix/bin |
| [ -z "$libdir" ] && libdir=$prefix/lib | | [ -z "$libdir" ] && libdir=$prefix/lib |
| [ -z "$libexecdir" ] && libexecdir=$prefix/libexec | | [ -z "$libexecdir" ] && libexecdir=$prefix/libexec |
| [ -z "$etcdir" ] && etcdir=$prefix/etc | | [ -z "$etcdir" ] && etcdir=$prefix/etc |
| [ -z "$initdir" ] && initdir=$prefix/init | | [ -z "$initdir" ] && initdir=$prefix/init |
| [ -z "$datarootdir" ] && datarootdir=$prefix/share | | [ -z "$datarootdir" ] && datarootdir=$prefix/share |
| [ -z "$mandir" ] && mandir=$datarootdir/man | | [ -z "$mandir" ] && mandir=$datarootdir/man |
| [ -z "$docdir" ] && docdir=$datarootdir/doc | | [ -z "$docdir" ] && docdir=$datarootdir/doc |
| [ -z "$vimdatadir" ] && vimdatadir=$datarootdir/vim/vimfiles | | [ -z "$vimdatadir" ] && vimdatadir=$datarootdir/vim/vimfiles |
|
| | [ -z "$nagelfardatadir" ] && nagelfardatadir=$datarootdir/nagelfar |
| [ -z "$modulefilesdir" ] && modulefilesdir=$prefix/modulefiles | | [ -z "$modulefilesdir" ] && modulefilesdir=$prefix/modulefiles |
| [ -z "$moduleshome" ] && moduleshome=$prefix | | [ -z "$moduleshome" ] && moduleshome=$prefix |
| # default modulepath based on MODULE_VERSION if versioning enabled | | # default modulepath based on MODULE_VERSION if versioning enabled |
|
| [ -z "$modulepath" -a "$versioning" = 'y' ] && modulepath=${modulefilesdir/#$pre
fix/$baseprefix\/\$MODULE_VERSION} | | [ -z "$modulepath" ] && [ "$versioning" = 'y' ] && modulepath=${modulefilesdir/#
$prefix/$baseprefix\/\$MODULE_VERSION} |
| [ -z "$modulepath" ] && modulepath=$modulefilesdir | | [ -z "$modulepath" ] && modulepath=$modulefilesdir |
| | |
| # define libdir64 and libdir32 based on libdir if multilib support enabled | | # define libdir64 and libdir32 based on libdir if multilib support enabled |
| if [ "$multilibsupport" = 'y' ]; then | | if [ "$multilibsupport" = 'y' ]; then |
| case "$libdir" in | | case "$libdir" in |
| *64*) | | *64*) |
| libdir64=$libdir ; | | libdir64=$libdir ; |
| libdir32=${libdir/64} ;; | | libdir32=${libdir/64} ;; |
| *) | | *) |
| libdir64=${libdir/lib/lib64} ; | | libdir64=${libdir/lib/lib64} ; |
| libdir32=$libdir ;; | | libdir32=$libdir ;; |
| esac | | esac |
| fi | | fi |
| | |
| # check feature requirements are met | | # check feature requirements are met |
|
| if [ "$setmodulespath" = 'y' -a -n "$loadedmodules" ]; then | | if [ "$setmodulespath" = 'y' ] && [ -n "$loadedmodules" ]; then |
| featmesg="As \`setmodulespath' is enabled beware that \`loadedmodules' may be
ignored by init scripts" | | featmesg="As \`setmodulespath' is enabled beware that \`loadedmodules' may be
ignored by init scripts" |
| echo_warning "$featmesg" | | echo_warning "$featmesg" |
| fi | | fi |
|
| if [ -n "$loadedmodules" -a -z "$modulepath" ]; then | | if [ -n "$loadedmodules" ] && [ -z "$modulepath" ]; then |
| featmesg="A value is set for \`loadedmodules' whereas \`modulepath' is not de
fined" | | featmesg="A value is set for \`loadedmodules' whereas \`modulepath' is not de
fined" |
| echo_warning "$featmesg" | | echo_warning "$featmesg" |
| fi | | fi |
| | |
| # prepare extension library sources if not yet done whether libtclenvmodules | | # prepare extension library sources if not yet done whether libtclenvmodules |
| # is enabled or not to create consistent dist in any cases. | | # is enabled or not to create consistent dist in any cases. |
| if [ ! -e 'lib/configure' ]; then | | if [ ! -e 'lib/configure' ]; then |
| check_requirement autoreconf | | check_requirement autoreconf |
| echo "--- preparing extension library sources ----------" | | echo "--- preparing extension library sources ----------" |
| pushd lib | | pushd lib |
| | |
| skipping to change at line 1053 | | skipping to change at line 1086 |
|---|
| # and build Makefile translation expression | | # and build Makefile translation expression |
| translation_regexp=() | | translation_regexp=() |
| for arg in ${arglist}; do | | for arg in ${arglist}; do |
| echo "$arg = ${!arg}" | | echo "$arg = ${!arg}" |
| translation_regexp+=('-e' "s|@${arg}@|${!arg}|g") | | translation_regexp+=('-e' "s|@${arg}@|${!arg}|g") |
| done | | done |
| | |
| # configure extension library sources | | # configure extension library sources |
| if [ "$libtclenvmodules" = 'y' ]; then | | if [ "$libtclenvmodules" = 'y' ]; then |
| echo "--- configuring extension library sources --------" | | echo "--- configuring extension library sources --------" |
|
| echo "libarglist = $libarglist" | | echo "libarglist = ${libarglist[*]}" |
| pushd lib | | pushd lib |
|
| ./configure $libarglist || exit 1 | | ./configure "${libarglist[@]}" || exit 1 |
| popd | | popd |
| echo "--------------------------------------------------" | | echo "--------------------------------------------------" |
| fi | | fi |
| | |
| # generate Makefiles | | # generate Makefiles |
| for target in ${targetlist}; do | | for target in ${targetlist}; do |
| # escape any '$' in value for Makefile or testsuite interpretation | | # escape any '$' in value for Makefile or testsuite interpretation |
| if [ "${target/Makefile}" = "${target}" ]; then | | if [ "${target/Makefile}" = "${target}" ]; then |
| extra_regexp=() | | extra_regexp=() |
| else | | else |
| extra_regexp=('-e' 's|\$|\$\$|g') | | extra_regexp=('-e' 's|\$|\$\$|g') |
| fi | | fi |
| echo "creating $target" | | echo "creating $target" |
|
| sed "${translation_regexp[@]}" "${extra_regexp[@]}" ${target}.in >$target | | sed "${translation_regexp[@]}" "${extra_regexp[@]}" "${target}.in" >"$target" |
| done | | done |
| | |
| exit 0 | | exit 0 |
| | |
| # vim:set tabstop=3 shiftwidth=3 expandtab autoindent: | | # vim:set tabstop=3 shiftwidth=3 expandtab autoindent: |
| | | |
| End of changes. 38 change blocks. |
|---|
| 29 lines changed or deleted | | 63 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 