Merge branch 'master' of gitorious.psi.ch:scicomp/psi-modules-buildenvironment

lib/libem.bash

@@ -152,7 +152,9 @@ declare -x LIBRARY_PATH
 declare -x LD_LIBRARY_PATH
 declare -x DYLD_LIBRARY_PATH
 
-module purge
+if typeset -f module > /dev/null 2>&1 ; then
+	module purge
+fi
 
 if [[ $DEBUG_ON ]]; then
 	trap 'echo "$BASH_COMMAND"' DEBUG

scripts/Modules.build

@@ -5,7 +5,7 @@ source "$(dirname $0)/../lib/libem.bash"
 
 
 function em.configure() {
-	"${EM_SRCDIR}"/configure \
+	CPPFLAGS="-DUSE_INTERP_ERRORLINE" "${EM_SRCDIR}"/configure \
 		--prefix="${EM_BINDIR}/${EM_FAMILY}" \
 		--with-module-path="${MODULEPATH_ROOT}" \
 		|| exit 1