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

config/versions.conf

@@ -24,6 +24,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

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 \

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}