Skip to content

Commit 6ef6a3f

Browse files
committed
Fix the Fortran mpiext building system
Signed-off-by: Aurélien Bouteiller <[email protected]>
1 parent 5f6ba81 commit 6ef6a3f

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

config/ompi_ext.m4

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ dnl Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
77
dnl Copyright (c) 2011-2012 Oak Ridge National Labs. All rights reserved.
88
dnl Copyright (c) 2015 Research Organization for Information Science
99
dnl and Technology (RIST). All rights reserved.
10+
dnl Copyright (c) 2017 The University of Tennessee and The University
11+
dnl of Tennessee Research Foundation. All rights
12+
dnl reserved.
1013
dnl $COPYRIGHT$
1114
dnl
1215
dnl Additional copyrights may follow
@@ -554,17 +557,17 @@ EOF
554557
#
555558
# Include the mpif.h header if it is available. Cannot do
556559
# this from inside the usempi.h since, for VPATH builds, the
557-
# top_ompi_srcdir is needed to find the header.
560+
# srcdir is needed to find the header.
558561
#
559562
if test "$enabled_mpifh" = 1; then
560563
mpifh_component_header="mpiext_${component}_mpifh.h"
561564
cat >> $mpiusempi_ext_h <<EOF
562-
include '$top_ompi_srcdir/ompi/mpiext/$component/mpif-h/$mpifh_component_header'
565+
include '${srcdir}/ompi/mpiext/$component/mpif-h/$mpifh_component_header'
563566
EOF
564567
fi
565568

566569
cat >> $mpiusempi_ext_h <<EOF
567-
include '$top_ompi_srcdir/ompi/mpiext/$component/use-mpi/$component_header'
570+
include '${srcdir}/ompi/mpiext/$component/use-mpi/$component_header'
568571
569572
EOF
570573
else
@@ -607,17 +610,17 @@ EOF
607610
#
608611
# Include the mpif.h header if it is available. Cannot do
609612
# this from inside the usempif08.h since, for VPATH builds,
610-
# the top_ompi_srcdir is needed to find the header.
613+
# the srcdir is needed to find the header.
611614
#
612615
if test "$enabled_mpifh" = 1; then
613616
mpifh_component_header="mpiext_${component}_mpifh.h"
614617
cat >> $mpiusempif08_ext_h <<EOF
615-
include '$top_ompi_srcdir/ompi/mpiext/$component/mpif-h/$mpifh_component_header'
618+
include '${srcdir}/ompi/mpiext/$component/mpif-h/$mpifh_component_header'
616619
EOF
617620
fi
618621

619622
cat >> $mpiusempif08_ext_h <<EOF
620-
include '$top_ompi_srcdir/ompi/mpiext/$component/use-mpi-f08/$component_header'
623+
include '${srcdir}/ompi/mpiext/$component/use-mpi-f08/$component_header'
621624
622625
EOF
623626
else

0 commit comments

Comments
 (0)