From aea5730c940b3682315bbef08cae300e88f15569 Mon Sep 17 00:00:00 2001
From: Martin Diehl <m.diehl@mpie.de>
Date: Tue, 20 Nov 2018 21:54:55 +0100
Subject: [PATCH] don't disturb the search routines of MSC.Marc

---
 .../2018.1/Marc_tools/include_linux64          | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/installation/mods_MarcMentat/2018.1/Marc_tools/include_linux64 b/installation/mods_MarcMentat/2018.1/Marc_tools/include_linux64
index 53052b065..53eef9d83 100644
--- a/installation/mods_MarcMentat/2018.1/Marc_tools/include_linux64
+++ b/installation/mods_MarcMentat/2018.1/Marc_tools/include_linux64
@@ -63,14 +63,6 @@ else
  INTEGER_PATH=/$MARC_INTEGER_SIZE
 fi
 
-if test "$DAMASK_HDF5" = "ON";then
-  H5FC="$(h5fc -show)"
-  HDF5_LIB=${$H5FC//ifort/}
-  FCOMP=$H5FC
-else
-  FCOMP=ifort
-fi
-
 INTELPATH="/opt/intel/compilers_and_libraries_2017/linux"
 
 # find the root directory of the compiler installation:
@@ -106,6 +98,16 @@ else
  FCOMPROOT=
 fi
 
+# DAMASK uses the HDF5 compiler wrapper around the Intel compiler
+if test "$DAMASK_HDF5" = "ON";then
+  H5FC="$(h5fc -shlib -show)"
+  HDF5_LIB=${H5FC//ifort/}
+  FCOMP="$H5FC -DDAMASKHDF5"
+  echo $FCOMP
+else
+  FCOMP=ifort
+fi
+
 # AEM
 if test "$MARCDLLOUTDIR" = ""; then
  DLLOUTDIR="$MARC_LIB"