From 7754412d8cf4076f44b9bd685fe476c710204505 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 17 Sep 2014 17:47:54 +0200
Subject: [PATCH] libem.bash: specify modules to pre-load with --with=; this
 make --with-something= obsolete

---
 lib/libem.bash | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/libem.bash b/lib/libem.bash
index 37d6dc7..0f01dd0 100644
--- a/lib/libem.bash
+++ b/lib/libem.bash
@@ -113,7 +113,7 @@ FORCE_REBUILD=''
 ENVIRONMENT_ARGS=''
 WITH_ARGS=''
 DRY_RUN=''
-
+with_modules=()
 while (( $# > 0 )); do
 	case $1 in
 	-j )
@@ -141,6 +141,9 @@ while (( $# > 0 )); do
 			MODULE_RELEASE=".${MODULE_RELEASE}"
 		fi
 		;;
+	--with=*/* )
+		with_modules+=( ${1/--with=} )
+		;;
 	--with-hdf5=*)
 		v=${1/--with-hdf5=}
 		ENVIRONMENT_ARGS="${ENVIRONMENT_ARGS} HDF5=hdf5 HDF5_VERSION=$v"
@@ -238,6 +241,9 @@ function is_module_available() {
 }
 
 function _load_build_dependencies() {
+	for m in "${with_modules[@]}"; do
+		module load "${m}"
+	done
 	for m in "${MODULE_BUILD_DEPENDENCIES[@]}"; do
 		[[ -z $m ]] && continue
 		if [[ ! $m =~ "*/*" ]]; then