From 8ca9ebd26c31ee8cf42b1f8215e3774996d8d40b Mon Sep 17 00:00:00 2001
From: Hui Zhou <hzhou321@anl.gov>
Date: Sat, 16 Dec 2023 17:53:11 -0600
Subject: [PATCH] misc: move mpif90model.h.in to src/include

We need to add the include dir of the both srcdir tree and builddir tree
to AM_CPPFLAGS if the header files is generated. Rather than inflate
AM_CPPFLAGS, move mpif90model.h.in to src/include since it is already in
AM_CPPFLAGS.
---
 .gitignore                                     | 2 +-
 configure.ac                                   | 2 +-
 doc/installguide/cfile                         | 2 +-
 src/{mpi/datatype => include}/mpif90model.h.in | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename src/{mpi/datatype => include}/mpif90model.h.in (100%)

diff --git a/.gitignore b/.gitignore
index 983e6e11a..0faa4418a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -419,7 +419,6 @@ Makefile.am-stamp
 /src/binding/fortran/use_mpi/mpimod.pcl
 /src/binding/fortran/use_mpi/mpi_sizeofs.f90
 /src/binding/fortran/use_mpi/mpi_base.f90
-/src/binding/fortran/use_mpi/mpif90model.h
 /src/binding/fortran/use_mpi/mpif90type.h
 /src/binding/fortran/use_mpi/mpi_constants.f90
 /src/binding/fortran/use_mpi/mpifnoext.h
@@ -472,6 +471,7 @@ Makefile.am-stamp
 # /src/include/
 /src/include/mpi.h
 /src/include/mpif.h
+/src/include/mpif90model.h
 #/src/include/mpe_thread.h
 /src/include/mpimod.pcl
 /src/include/mpidu_datatype.h
diff --git a/configure.ac b/configure.ac
index d0ca9f963..db31dc00a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4327,7 +4327,7 @@ AC_CONFIG_FILES([Makefile \
 	  src/env/mpifort.bash \
           src/env/parkill \
           src/include/mpi.h \
-          src/mpi/datatype/mpif90model.h \
+          src/include/mpif90model.h \
           doc/installguide/Makefile \
           doc/refman/Makefile \
           doc/userguide/Makefile \
diff --git a/doc/installguide/cfile b/doc/installguide/cfile
index a125b5d11..7a919e8c1 100644
--- a/doc/installguide/cfile
+++ b/doc/installguide/cfile
@@ -7,7 +7,7 @@ CROSS_F90_OFFSET_KIND=8
 CROSS_F77_TRUE_VALUE=1
 CROSS_F77_FALSE_VALUE=0
 CROSS_F90_INTEGER_KIND=4
-# Next variables should be set in 'src/binding/fortran/use_mpi/mpif90model.h' during './configure' step
+# Next variables should be set in 'src/include/mpif90model.h' during './configure' step
 CROSS_F90_REAL_MODEL=6,37
 CROSS_F90_DOUBLE_MODEL=15,307
 CROSS_F90_INTEGER_MODEL=9
diff --git a/src/mpi/datatype/mpif90model.h.in b/src/include/mpif90model.h.in
similarity index 100%
rename from src/mpi/datatype/mpif90model.h.in
rename to src/include/mpif90model.h.in