Merge branch 'master' of git.psi.ch:Pmodules/buildblocks

HDF5/H5hut/2/variants

@@ -0,0 +1 @@
+H5hut/2.0.0rc1	unstable	b:automake/1.14 b:autoconf/2.69 b:libtool/2.4.2 gcc/5.3.0 openmpi/1.10.2 hdf5/1.8.16 b:Python/2.7.11 b:parmetis/4.0.3

HDF5/H5hut/build

@@ -5,19 +5,19 @@ pbuild::pre_configure() {
 }
 
 pbuild::configure() {
-	CC=$MPICC
-	CXX=$MPICXX
-	F77=$MPIF77
-	F90=$MPIF90
-	FC=$MPIFC
-	FORTRAN=$MPIFORTRAN
-	#( cd "${MODULE_SRCDIR}" && ./autogen.sh )
+	if (( V_MAJOR >= 2 )); then
+		config_args+=" --enable-python"
+	fi
+
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
 		--enable-parallel \
 		--enable-debug \
+		--enable-fortran \
+		--enable-shared \
 		--with-hdf5=$HDF5_PREFIX \
 		--with-pic \
+		${config_args} \
 		|| exit 1
 }
 
@@ -33,8 +33,6 @@ pbuild::install() {
 
 
 pbuild::add_to_group 'HDF5'
-pbuild::set_runtime_dependencies "${COMPILER}" "${MPI}" 'hdf5'
-pbuild::set_build_dependencies   "autoconf" "automake" "libtool" "${COMPILER}" "${MPI}" "hdf5"
 pbuild::set_docfiles 'AUTHORS' 'COPYING'
 pbuild::make_all