From b51df651587be0a947f86092e5bb92e63a344fd4 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 14 May 2014 10:17:10 +0200
Subject: [PATCH 1/3] versions.conf: patchelf added

---
 config/versions.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/versions.conf b/config/versions.conf
index a220e3c..738d1bd 100644
--- a/config/versions.conf
+++ b/config/versions.conf
@@ -23,6 +23,7 @@ mpc		1.0.2
 mpfr		3.1.2
 OPAL		1.2.0
 parmetis	3.2.0
+patchelf	0.8.1
 root		5.34.11
 tiff		4.0.3
 trilinos	11.4.1

From a99a7d644bad5671c00b0ef941528b5fc1461df6 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 14 May 2014 10:18:45 +0200
Subject: [PATCH 2/3] all.build: die if EM_ETCDIR is not set (MODULESHOME is
 not sufficient)

---
 scripts/all.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/all.build b/scripts/all.build
index eed5d8f..0603af4 100755
--- a/scripts/all.build
+++ b/scripts/all.build
@@ -2,7 +2,7 @@
 
 source "$(dirname $0)/../lib/lib.bash"
 
-[[ -z $MODULESHOME ]] && die 1 "Module environment not loaded"
+[[ -z $EM_ETCDIR ]] && die 1 "Module environment not loaded"
 
 while read family rest; do
 	$(dirname $0)/family.build ${family}

From f0039c418e391a611b318c0ebfc26b348a3275b8 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 14 May 2014 10:20:41 +0200
Subject: [PATCH 3/3] H5hut.build: set MPI compiler environment variables

---
 scripts/H5hut.build | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/H5hut.build b/scripts/H5hut.build
index 00f3590..907122f 100755
--- a/scripts/H5hut.build
+++ b/scripts/H5hut.build
@@ -2,8 +2,18 @@
 
 source "$(dirname $0)/../lib/libem.bash"
 
+function em.pre_configure() {
+	./autogen.sh
+}
+
 function em.configure() {
-	( cd "${EM_SRCDIR}" && ./autogen.sh )
+	CC=$MPICC
+	CXX=$MPICXX
+	F77=$MPIF77
+	F90=$MPIF90
+	FC=$MPIFC
+	FORTRAN=$MPIFORTRAN
+	#( cd "${EM_SRCDIR}" && ./autogen.sh )
 	"${EM_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-parallel \