File tree Expand file tree Collapse file tree 10 files changed +44
-30
lines changed
docs/installing-open-mpi/configure-cli-options Expand file tree Collapse file tree 10 files changed +44
-30
lines changed Original file line number Diff line number Diff line change @@ -166,6 +166,15 @@ case "x$enable_mpi_fortran" in
166
166
;;
167
167
esac
168
168
169
+ AC_MSG_CHECKING([where to install Fortran MPI modules])
170
+ AC_ARG_WITH([mpi-moduledir],
171
+ [AS_HELP_STRING([--with-mpi-moduledir],
172
+ [specify where to install Fortran MPI modules (default: $libdir )])],
173
+ [OMPI_FORTRAN_MODULEDIR= $withval ],
174
+ [OMPI_FORTRAN_MODULEDIR= $libdir ])
175
+ AC_SUBST(OMPI_FORTRAN_MODULEDIR)
176
+ AC_MSG_RESULT([$OMPI_FORTRAN_MODULEDIR ])
177
+
169
178
# Remove these when we finally kill them once and for all
170
179
AC_ARG_ENABLE([mpi1-compatibility],
171
180
[AS_HELP_STRING([--enable-mpi1-compatibility],
Original file line number Diff line number Diff line change @@ -541,7 +541,7 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
541
541
OMPI_WRAPPER_FCFLAGS='-I${includedir}'" ${wrapper_extra_fcflags} ${with_wrapper_fcflags}"
542
542
AS_IF ( [ test -n "${OMPI_FC_MODULE_FLAG}"] ,
543
543
[ dnl deal with some interesting expansion behavior in OPAL_APPEND
544
- wrapper_tmp_arg="${OMPI_FC_MODULE_FLAG}"'${libdir}'
544
+ wrapper_tmp_arg="${OMPI_FC_MODULE_FLAG} ${OMPI_FORTRAN_MODULEDIR}"
545
545
OPAL_APPEND([ OMPI_WRAPPER_FCFLAGS] , [ ${wrapper_tmp_arg}] )] )
546
546
AC_SUBST ( [ OMPI_WRAPPER_FCFLAGS] )
547
547
AC_MSG_RESULT ( [ $OMPI_WRAPPER_EXTRA_FCFLAGS] )
@@ -780,7 +780,7 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
780
780
OSHMEM_WRAPPER_FCFLAGS='-I${includedir}'" ${wrapper_extra_fcflags} ${with_wrapper_fcflags}"
781
781
AS_IF ( [ test -n "${OMPI_FC_MODULE_FLAG}"] ,
782
782
[ dnl deal with some interesting expansion behavior in OPAL_APPEND
783
- wrapper_tmp_arg="${OMPI_FC_MODULE_FLAG}"'${libdir}'
783
+ wrapper_tmp_arg="${OMPI_FC_MODULE_FLAG} ${OMPI_FORTRAN_MODULEDIR}"
784
784
OPAL_APPEND([ OSHMEM_WRAPPER_FCFLAGS] , [ ${wrapper_tmp_arg}] )] )
785
785
AC_SUBST ( [ OSHMEM_WRAPPER_FCFLAGS] )
786
786
AC_MSG_RESULT ( [ $OSHMEM_WRAPPER_EXTRA_FCFLAGS] )
Original file line number Diff line number Diff line change @@ -60,6 +60,11 @@ MPI API behaviors that can be used with ``configure``:
60
60
``--disable-mpi-fortran ``). This is mutually exclusive
61
61
with building the OpenSHMEM Fortran interface.
62
62
63
+ * ``--with-mpi-moduledir=DIR ``:
64
+ Specify a specific ``DIR `` directory where to install the MPI
65
+ Fortran bindings modulefiles. By default, Open MPI will install
66
+ Fortran modulefiles into ``$libdir ``.
67
+
63
68
* ``--enable-mpi-ext[=LIST] ``:
64
69
Enable Open MPI's non-portable API extensions. ``LIST `` is a
65
70
comma-delmited list of extensions. If no ``LIST `` is specified, all
Original file line number Diff line number Diff line change @@ -73,14 +73,14 @@ CLEANFILES += *.i90
73
73
#
74
74
install-exec-hook :
75
75
@ for file in ` ls * .mod` ; do \
76
- echo $(INSTALL ) $$ file $(DESTDIR )$(libdir ) ; \
77
- $(INSTALL ) $$ file $(DESTDIR )$(libdir ) ; \
76
+ echo $(INSTALL ) $$ file $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) ; \
77
+ $(INSTALL ) $$ file $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) ; \
78
78
done
79
79
80
80
uninstall-local :
81
81
@ for file in ` ls * .mod` ; do \
82
- echo rm -f $(DESTDIR )$(libdir ) /$$ file; \
83
- rm -f $(DESTDIR )$(libdir ) /$$ file; \
82
+ echo rm -f $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) /$$ file; \
83
+ rm -f $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) /$$ file; \
84
84
done
85
85
86
86
else
Original file line number Diff line number Diff line change @@ -71,14 +71,14 @@ CLEANFILES += *.i90
71
71
#
72
72
install-exec-hook :
73
73
@ for file in ` ls * .mod` ; do \
74
- echo $(INSTALL ) $$ file $(DESTDIR )$(libdir ) ; \
75
- $(INSTALL ) $$ file $(DESTDIR )$(libdir ) ; \
74
+ echo $(INSTALL ) $$ file $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) ; \
75
+ $(INSTALL ) $$ file $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) ; \
76
76
done
77
77
78
78
uninstall-local :
79
79
@ for file in ` ls * .mod` ; do \
80
- echo rm -f $(DESTDIR )$(libdir ) /$$ file; \
81
- rm -f $(DESTDIR )$(libdir ) /$$ file; \
80
+ echo rm -f $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) /$$ file; \
81
+ rm -f $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) /$$ file; \
82
82
done
83
83
84
84
else
Original file line number Diff line number Diff line change @@ -566,14 +566,14 @@ mpi-f08.lo: $(module_sentinel_files) $(SIZEOF_H)
566
566
567
567
install-exec-hook :
568
568
@ for file in ` ls * .mod` ; do \
569
- echo $(INSTALL ) $$ file $(DESTDIR )$(libdir ) ; \
570
- $(INSTALL ) $$ file $(DESTDIR )$(libdir ) ; \
569
+ echo $(INSTALL ) $$ file $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) ; \
570
+ $(INSTALL ) $$ file $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) ; \
571
571
done
572
572
573
573
uninstall-local :
574
574
@ for file in ` ls * .mod` ; do \
575
- echo rm -f $(DESTDIR )$(libdir ) /$$ file; \
576
- rm -f $(DESTDIR )$(libdir ) /$$ file; \
575
+ echo rm -f $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) /$$ file; \
576
+ rm -f $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) /$$ file; \
577
577
done
578
578
579
579
endif
Original file line number Diff line number Diff line change @@ -102,14 +102,14 @@ pmpi-f08-interfaces.lo: mpi-f08-rename.h
102
102
103
103
install-exec-hook :
104
104
@ for file in ` ls * .mod` ; do \
105
- echo $(INSTALL ) $$ file $(DESTDIR )$(libdir ) ; \
106
- $(INSTALL ) $$ file $(DESTDIR )$(libdir ) ; \
105
+ echo $(INSTALL ) $$ file $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) ; \
106
+ $(INSTALL ) $$ file $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) ; \
107
107
done
108
108
109
109
uninstall-local :
110
110
@ for file in ` ls * .mod` ; do \
111
- echo rm -f $(DESTDIR )$(libdir ) /$$ file; \
112
- rm -f $(DESTDIR )$(libdir ) /$$ file; \
111
+ echo rm -f $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) /$$ file; \
112
+ rm -f $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) /$$ file; \
113
113
done
114
114
115
115
endif
Original file line number Diff line number Diff line change @@ -136,14 +136,14 @@ CLEANFILES += *.i90
136
136
137
137
install-exec-hook :
138
138
@ for file in ` ls * .mod` ; do \
139
- echo $(INSTALL ) $$ file $(DESTDIR )$(libdir ) ; \
140
- $(INSTALL ) $$ file $(DESTDIR )$(libdir ) ; \
139
+ echo $(INSTALL ) $$ file $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) ; \
140
+ $(INSTALL ) $$ file $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) ; \
141
141
done
142
142
143
143
uninstall-local :
144
144
@ for file in ` ls * .mod` ; do \
145
- echo rm -f $(DESTDIR )$(libdir ) /$$ file; \
146
- rm -f $(DESTDIR )$(libdir ) /$$ file; \
145
+ echo rm -f $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) /$$ file; \
146
+ rm -f $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) /$$ file; \
147
147
done
148
148
149
149
endif
Original file line number Diff line number Diff line change @@ -168,14 +168,14 @@ DISTCLEANFILES = $(nodist_lib@OMPI_LIBMPI_NAME@_usempi_la_SOURCES)
168
168
169
169
install-exec-hook :
170
170
@ for file in ` ls * .mod` ; do \
171
- echo $(INSTALL ) $$ file $(DESTDIR )$(libdir ) ; \
172
- $(INSTALL ) $$ file $(DESTDIR )$(libdir ) ; \
171
+ echo $(INSTALL ) $$ file $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) ; \
172
+ $(INSTALL ) $$ file $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) ; \
173
173
done
174
174
175
175
uninstall-local :
176
176
@ for file in ` ls * .mod` ; do \
177
- echo rm -f $(DESTDIR )$(libdir ) /$$ file; \
178
- rm -f $(DESTDIR )$(libdir ) /$$ file; \
177
+ echo rm -f $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) /$$ file; \
178
+ rm -f $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) /$$ file; \
179
179
done
180
180
181
181
# if OMPI_BUILD_FORTRAN_USEMPI_TKR_BINDINGS
Original file line number Diff line number Diff line change @@ -55,13 +55,13 @@ mpi-types.lo: mpi-types.F90
55
55
56
56
install-exec-hook :
57
57
@ for file in ` ls * .mod` ; do \
58
- echo $(INSTALL ) $$ file $(DESTDIR )$(libdir ) ; \
59
- $(INSTALL ) $$ file $(DESTDIR )$(libdir ) ; \
58
+ echo $(INSTALL ) $$ file $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) ; \
59
+ $(INSTALL ) $$ file $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) ; \
60
60
done
61
61
62
62
uninstall-local :
63
63
@ for file in ` ls * .mod` ; do \
64
- echo rm -f $(DESTDIR )$(libdir ) /$$ file; \
65
- rm -f $(DESTDIR )$(libdir ) /$$ file; \
64
+ echo rm -f $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) /$$ file; \
65
+ rm -f $(DESTDIR )$(OMPI_FORTRAN_MODULEDIR ) /$$ file; \
66
66
done
67
67
endif
You can’t perform that action at this time.
0 commit comments