Implement PYTHONPATH initialization

Adding the initdir to PYTHONPATH allows users to "import" the "module"
function in Python scripts.

Signed-off-by: Byron Boulton <bboulton@ara.com>

Author: Byron Boulton

Makefile

@@ -479,6 +479,8 @@ sed -e 's|@prefix@|$(prefix)|g' \
 	-e 's|@setmanpath@|$(setsetmanpath)|g' \
 	-e 's|@appendmanpath@|$(setappendmanpath)|g' \
 	-e 's|@usemanpath@|$(setusemanpath)|g' \
+	-e 's|@setpythonpath@|$(setsetpythonpath)|g' \
+	-e 's|@appendpythonpath@|$(setappendpythonpath)|g' \
 	-e 's|@notusemanpath@|$(setnotusemanpath)|g' \
 	-e 's|@shellcompsource@|$(shellcompsource)|g' \
 	-e 's|@tcllintercmd@|$(tcllintercmd)|g' \

Makefile.inc.in

@@ -48,6 +48,8 @@ libdir32 := @libdir32@
 # enable or not some specific definition
 setmanpath := @setmanpath@
 appendmanpath := @appendmanpath@
+setpythonpath := @setpythonpath@
+appendpythonpath := @appendpythonpath@
 setbinpath := @setbinpath@
 appendbinpath := @appendbinpath@
 setmodulespath := @setmodulespath@
@@ -179,3 +181,6 @@ BASENAME := @BASENAME@
 RMDIR_IGN_NON_EMPTY := @RMDIR_IGN_NON_EMPTY@
 SED_ERE := @SED_ERE@
 
+# profile init scripts put init dir on PYTHONPATH
+setpythonpath := @setpythonpath@
+

configure

@@ -41,7 +41,7 @@ listterseoutput editor variantshortcut bashcompletiondir fishcompletiondir \
 zshcompletiondir tcllinter tcllinteropts nagelfardatadir nagelfaraddons \
 stickypurge uniquenameloaded abortonerror sourcecache logger loggeropts \
 loggedevents conflictunload spideroutput spiderterseoutput spiderindepth \
-emacsdatadir emacsaddons requirevia"
+emacsdatadir emacsaddons requirevia setpythonpath appendpythonpath"
 libarglist=()
 
 # flags to know if argument has been specified on command-line
@@ -52,6 +52,8 @@ defloggeropts=1
 prefix=/usr/local/Modules
 setmanpath=y
 appendmanpath=n
+setpythonpath=y
+appendpythonpath=y
 setbinpath=y
 appendbinpath=n
 setmodulespath=n
@@ -237,6 +239,8 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-set-manpath    set mandir to MANPATH in init scripts [yes]
   --enable-append-manpath append rather prepend mandir to MANPATH [no]
+  --enable-set-pythonpath set initdir to PYTHONPATH in init scripts [yes]
+  --enable-append-manpath append rather prepend initdir to PYTHONPATH [no]
   --enable-set-binpath    set bindir to PATH in init scripts [yes]
   --enable-append-binpath append rather prepend bindir to PATH [no]
   --enable-modulespath, --enable-dotmodulespath
@@ -720,6 +724,12 @@ for arg in "$@"; do
    --enable-append-manpath*|--disable-append-manpath)
       # shellcheck disable=SC2034
       appendmanpath=$(get_feature_value "$arg") ;;
+   --enable-set-pythonpath*|--disable-set-pythonpath)
+      # shellcheck disable=SC2034
+      setpythonpath=$(get_feature_value "$arg") ;;
+   --enable-append-pythonpath*|--disable-append-manpath)
+      # shellcheck disable=SC2034
+      appendpythonpath=$(get_feature_value "$arg") ;;
    --enable-set-binpath*|--disable-set-binpath)
       # shellcheck disable=SC2034
       setbinpath=$(get_feature_value "$arg") ;;

site.exp.in

@@ -32,6 +32,8 @@ set install_libdir32 "@libdir32@"
 set install_setmanpath "@setmanpath@"
 set install_appendmanpath "@appendmanpath@"
 set install_usemanpath "@usemanpath@"
+set install_setpythonpath "@setpythonpath@"
+set install_appendpythonpath "@appendpythonpath@"
 set install_setbinpath "@setbinpath@"
 set install_appendbinpath "@appendbinpath@"
 set install_examplemodulefiles "@examplemodulefiles@"

tcl/subcmd.tcl.in

@@ -2157,6 +2157,13 @@ proc cmdModuleAutoinit {} {
       @setmanpath@}
    }
 
+   # add Modules init directory to PYTHONPATH if enabled
+   @setpythonpath@if {![isEnvVarDefined PYTHONPATH]} {
+   @setpythonpath@   setenv PYTHONPATH {@initdir@}
+   @setpythonpath@} elseif {{@initdir@} ni [split [get-env PYTHONPATH] :]} {
+   @setpythonpath@   @appendpythonpath@-path PYTHONPATH {@initdir@}
+   @setpythonpath@}
+
    # source shell completion script if available, not installed in default
    # completion locations and only if shell is interactive
    if {[getState shell] in {@shellcompsource@} && [getState is_stderr_tty]} {