mirror of
https://code.it4i.cz/sccs/easyconfigs-it4i.git
synced 2025-04-08 07:52:11 +01:00
5fc33bbb1a
new file: m/MPI.NET/MPI.NET-1.2.0-intel-2017c.eb new file: m/MPI.NET/configure.ac.patch new file: m/MPI.NET/mpi.net-1.2.0-unsafe.patch modified: m/Mono/Mono-5.0.0.100.eb new file: m/Mono/Mono-5.18.1.0.eb
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
diff --git a/configure.ac b/configure.ac
|
|
index 1fc8651..fe5e8ba 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -20,7 +20,7 @@ AC_PROG_LIBTOOL
|
|
|
|
dnl C# compiler
|
|
AC_PATH_PROG(CSC, csc, no)
|
|
-AC_PATH_PROG(MCS, gmcs, no)
|
|
+AC_PATH_PROG(MCS, mcs, no)
|
|
AC_PATH_PROG(MONO, mono, no)
|
|
|
|
dnl CIL assembler
|
|
@@ -58,7 +58,7 @@ ACX_MPI([], [AC_MSG_ERROR([No MPI implementation found])])
|
|
AC_PATH_PROG(MPIEXEC, mpiexec, no)
|
|
|
|
dnl Whether we need the C bridge to make the MPI.NET assembly work
|
|
-need_cbridge="yes"
|
|
+need_cbridge="no"
|
|
|
|
dnl Determine which MPI this is (if we can). This block of checks will
|
|
dnl set three variables:
|
|
@@ -138,21 +138,19 @@ fi
|
|
|
|
dnl Find the actual file <mpi.h>, because we need to parse it to
|
|
dnl determine values of the various MPI constants.
|
|
-if test "x$MPI_INCLUDEDIRS" != "x" ; then
|
|
AC_MSG_CHECKING([for location of mpi.h])
|
|
|
|
- for dir in $MPI_INCLUDEDIRS ; do
|
|
+#PATCH: Set dir to path to Intel MPI on Salomon
|
|
+ dir="/apps/mpi/impi/5.0.3.048-iccifort-2015.3.187-GNU-5.1.0-2.25/include64"
|
|
if test -f "$dir/mpi.h" ; then
|
|
MPI_HEADER="$dir/mpi.h"
|
|
fi
|
|
- done
|
|
|
|
if test "x$MPI_HEADER" == "x" ; then
|
|
AC_MSG_ERROR([not found!])
|
|
else
|
|
AC_MSG_RESULT($MPI_HEADER)
|
|
fi
|
|
-fi
|
|
|
|
if test "$MPI_KIND" = "mpich2" ; then
|
|
dnl If it's MPICH2-based, make sure that MPICH2 was built as a shared
|