Skip to content

Commit

Permalink
Adding support for MODULES_AUTO_HANDLING
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert McLay committed Feb 21, 2024
1 parent 648509e commit 1489286
Show file tree
Hide file tree
Showing 5 changed files with 155 additions and 127 deletions.
4 changes: 3 additions & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ UPDATE_VERSION := LUA_PATH="$(srcdir)/tools/?.lua;$$LUA_PATH;;" $(src
PS := @PS@
READLINK := @READLINK@
EXPR := @EXPR@
MODULES_AUTO_HANDLING := @MODULES_AUTO_HANDLING@
PATH_TO_HASHSUM := @PATH_TO_HASHSUM@
PATH_TO_LUAC := @PATH_TO_LUAC@
PATH_TO_PAGER := @PATH_TO_PAGER@
Expand Down Expand Up @@ -270,7 +271,8 @@ __installMe:
-e 's|@hidden_italic@|$(LMOD_HIDDEN_ITALIC)|g' \
-e 's|@modulepath_init@|$(MODULEPATH_INIT)|g' \
-e 's|@sys_lua_cpath@|$(SYS_LUA_CPATH)|g' \
-e 's|@path_to_luac@|$(PATH_TO_LUAC)|g' \
-e 's|@modules_auto_handling@|$(MODULES_AUTO_HANDLING)|g' \
-e 's|@path_to_luac@|$(PATH_TO_LUAC)|g' \
-e 's|@path_to_lmod@|$(LIBEXEC)/lmod|g' \
-e 's|@have_lua_term@|$(HAVE_LUA_TERM)|g' \
-e 's|@silence_shell_debugging@|$(SILENCE_SHELL_DEBUGGING)|g' \
Expand Down
1 change: 1 addition & 0 deletions aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ echo "LMOD_CONFIG_DIR............................................." : $LMOD_CONF
echo "Use ~/.config/lmod directory only..........................." : $USE_DOT_CONFIG_DIR_ONLY
echo "Display Extensions w/ module avail.........................." : $AVAIL_EXTENSIONS
echo "Dynamic Spider Cache support................................" : $DYNAMIC_SPIDER_CACHE
echo "Modules Auto Handling......................................." : $MODULES_AUTO_HANDLING
echo "Allow for extended default.(ml intel/17 #-> intel/17.0.4)..." : $EXTENDED_DEFAULT #"
Expand Down
14 changes: 14 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,20 @@ AC_ARG_WITH(fastTCLInterp,
FAST_TCL_INTERP="$withval"
AC_DEFINE_UNQUOTED(FAST_TCL_INTERP, "$withval"))dnl

AC_SUBST(MODULES_AUTO_HANDLING)
AC_ARG_WITH(modulesAutoHandling,
AS_HELP_STRING([--with-modulesAutoHandling=ans],[Convert prereq() functions to depends_on(). [[no]]]),
MODULES_AUTO_HANDLING="$withval"
MODULES_AUTO_HANDLING=`echo $MODULES_AUTO_HANDLING | tr '@<:@:upper:@:>@' '@<:@:lower:@:>@'`
VALID_YN $MODULES_AUTO_HANDLING "--with-modulesAutoHandling=ans: ans must be yes or no"
AC_MSG_RESULT([MODULES_AUTO_HANDLING=$with_modulesAutoHandling])
AC_DEFINE_UNQUOTED(MODULES_AUTO_HANDLING, "$with_modulesAutoHandling")dnl
,
withval="no"
AC_MSG_RESULT([MODULES_AUTO_HANDLING=$withval])
MODULES_AUTO_HANDLING="$withval"
AC_DEFINE_UNQUOTED(MODULES_AUTO_HANDLING, "$withval"))dnl

AC_SUBST(AVAIL_EXTENSIONS)
AC_ARG_WITH(availExtensions,
AS_HELP_STRING([--with-availExtensions=ans],[Use the fast TCL interpreter. [[yes]]]),
Expand Down
Loading

0 comments on commit 1489286

Please sign in to comment.