[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-58-g134f47a

Service Account noreply at mpich.org
Fri Mar 21 12:59:58 CDT 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  134f47a235d546215f248dd936544a0b433aa123 (commit)
      from  32ab0609d378603af93418f12aac645da8af727e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/134f47a235d546215f248dd936544a0b433aa123

commit 134f47a235d546215f248dd936544a0b433aa123
Author: Junchao Zhang <jczhang at mcs.anl.gov>
Date:   Mon Feb 24 21:39:51 2014 -0600

    Rename Fortran binding directories.
    
    f77 and f90 were not consistent names with respect to what the code
    was providing.  For example, "f90" also used code from "f77".  This
    patch changes the naming to "mpif_h" and "use_mpi", which correspond
    to using the mpif.h and "use mpi module" conventions specified by the
    MPI standard.
    
    This also includes changes to buildiface, autogen.sh and .gitignore to
    work with these changes.
    
    Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>

diff --git a/.gitignore b/.gitignore
index 712b03a..6df55fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -144,8 +144,8 @@ Makefile.am-stamp
 
 # random stuff
 /maint/gcovmerge
-/src/binding/f77/buildiface-stamp
-/src/binding/f90/buildiface-stamp
+/src/binding/fortran/mpif_h/buildiface-stamp
+/src/binding/fortran/use_mpi/buildiface-stamp
 /src/binding/cxx/buildiface-stamp
 
 # script-generated f90 test files
@@ -159,8 +159,8 @@ Makefile.am-stamp
 # random additions
 /README.envvar
 /maint/extracterrmsgs
-/src/binding/f90/mpi_base.f90.in
-/src/binding/f90/mpi_constants.f90.in
+/src/binding/fortran/use_mpi/mpi_base.f90.in
+/src/binding/fortran/use_mpi/mpi_constants.f90.in
 /src/env/mpixxx_opts.conf
 /src/mpi/romio/include/mpio.h
 /src/mpi/romio/include/mpiof.h
@@ -186,11 +186,11 @@ Makefile.am-stamp
 /src/packaging/pkgconfig/mpich.pc
 
 # stamp "witness" files from the new build system
-/src/binding/f90/buildiface.stamp
-/src/binding/f90/mpi.mod-stamp
-/src/binding/f90/mpi_base.mod-stamp
-/src/binding/f90/mpi_constants.mod-stamp
-/src/binding/f90/mpi_sizeofs.mod-stamp
+/src/binding/fortran/use_mpi/buildiface.stamp
+/src/binding/fortran/use_mpi/mpi.mod-stamp
+/src/binding/fortran/use_mpi/mpi_base.mod-stamp
+/src/binding/fortran/use_mpi/mpi_constants.mod-stamp
+/src/binding/fortran/use_mpi/mpi_sizeofs.mod-stamp
 
 /src/mpe2/src/callstack/bin/bt2line
 
@@ -221,8 +221,8 @@ Makefile.am-stamp
 /src/env/f77_shlib.conf
 /src/env/fc_shlib.conf
 /maint/Version
-/src/binding/f77/Makefile.mk
-/src/binding/f90/Makefile.mk
+/src/binding/fortran/mpif_h/Makefile.mk
+/src/binding/fortran/use_mpi/Makefile.mk
 
 # MPICH2 parameter handling
 /src/include/mpich_cvars.h
@@ -403,37 +403,37 @@ Makefile.am-stamp
 /src/binding/cxx/cov2html
 /src/binding/cxx/*.h
 
-# /src/binding/f77/
-/src/binding/f77/include
-/src/binding/f77/Makefile.sm
-/src/binding/f77/mpif_bottom.h
-/src/binding/f77/setbotf.f
-/src/binding/f77/setbot.c
-/src/binding/f77/mpif77.conf
-/src/binding/f77/mpif77
-/src/binding/f77/*.c
-/src/binding/f77/fproto.h
-/src/binding/f77/mpif.h
-/src/binding/f77/mpif.h.in
-/src/binding/f77/fprotos.h
-
-# /src/binding/f90/
-/src/binding/f90/mpi_base.f90.orig
-/src/binding/f90/mpi_base.f90.new
-/src/binding/f90/mpif.h
-/src/binding/f90/Makefile.sm
-/src/binding/f90/mpi.f90
-/src/binding/f90/mpi_t1.f90
-/src/binding/f90/mpimod.pcl
-/src/binding/f90/mpi_sizeofs.f90
-/src/binding/f90/mpi_base.f90
-/src/binding/f90/mpif90model.h
-/src/binding/f90/mpif90type.h
-/src/binding/f90/mpi_constants.f90
-/src/binding/f90/typef90intf.c
-/src/binding/f90/typef90realf.c
-/src/binding/f90/typef90cmplxf.c
-/src/binding/f90/mpifnoext.h
+# /src/binding/fortran/mpif_h/
+/src/binding/fortran/mpif_h/include
+/src/binding/fortran/mpif_h/Makefile.sm
+/src/binding/fortran/mpif_h/mpif_bottom.h
+/src/binding/fortran/mpif_h/setbotf.f
+/src/binding/fortran/mpif_h/setbot.c
+/src/binding/fortran/mpif_h/mpif77.conf
+/src/binding/fortran/mpif_h/mpif77
+/src/binding/fortran/mpif_h/*.c
+/src/binding/fortran/mpif_h/fproto.h
+/src/binding/fortran/mpif_h/mpif.h
+/src/binding/fortran/mpif_h/mpif.h.in
+/src/binding/fortran/mpif_h/fprotos.h
+
+# /src/binding/fortran/use_mpi/
+/src/binding/fortran/use_mpi/mpi_base.f90.orig
+/src/binding/fortran/use_mpi/mpi_base.f90.new
+/src/binding/fortran/use_mpi/mpif.h
+/src/binding/fortran/use_mpi/Makefile.sm
+/src/binding/fortran/use_mpi/mpi.f90
+/src/binding/fortran/use_mpi/mpi_t1.f90
+/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/typef90intf.c
+/src/binding/fortran/use_mpi/typef90realf.c
+/src/binding/fortran/use_mpi/typef90cmplxf.c
+/src/binding/fortran/use_mpi/mpifnoext.h
 
 # /src/env/
 /src/env/mpicc
diff --git a/autogen.sh b/autogen.sh
index 6b4c5e1..665f468 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -666,14 +666,14 @@ if [ $do_bindings = "yes" ] ; then
     build_f90=no
     build_cxx=no
     if [ $do_f77 = "yes" ] ; then
-        if [ ! -s src/binding/f77/abortf.c ] ; then 
+        if [ ! -s src/binding/fortran/mpif_h/abortf.c ] ; then
 	    build_f77=yes
-        elif find src/binding/f77 -name 'buildiface' -newer 'src/binding/f77/abortf.c' >/dev/null 2>&1 ; then
+        elif find src/binding/fortran/mpif_h -name 'buildiface' -newer 'src/binding/fortran/mpif_h/abortf.c' >/dev/null 2>&1 ; then
 	    build_f77=yes
         fi
-        if [ ! -s src/binding/f90/mpi_base.f90 ] ; then
+        if [ ! -s src/binding/fortran/use_mpi/mpi_base.f90 ] ; then
  	    build_f90=yes
-        elif find src/binding/f90 -name 'buildiface' -newer 'src/binding/f90/mpi_base.f90' >/dev/null 2>&1 ; then
+        elif find src/binding/fortran/use_mpi -name 'buildiface' -newer 'src/binding/fortran/use_mpi/mpi_base.f90' >/dev/null 2>&1 ; then
 	    build_f90=yes
         fi
  
@@ -681,16 +681,16 @@ if [ $do_bindings = "yes" ] ; then
 
     if [ $build_f77 = "yes" ] ; then
 	echo_n "Building Fortran 77 interface... "
-	( cd src/binding/f77 && chmod a+x ./buildiface && ./buildiface )
+	( cd src/binding/fortran/mpif_h && chmod a+x ./buildiface && ./buildiface )
 	echo "done"
     fi
     if [ $build_f90 = "yes" ] ; then
 	echo_n "Building Fortran 90 interface... "
 	# Remove any copy of mpi_base.f90 (this is used to handle the
 	# Double precision vs. Real*8 option
-	rm -f src/binding/f90/mpi_base.f90.orig
-	( cd src/binding/f90 && chmod a+x ./buildiface && ./buildiface )
-	( cd src/binding/f90 && ../f77/buildiface -infile=cf90t.h -deffile=cf90tdefs)
+	rm -f src/binding/fortran/use_mpi/mpi_base.f90.orig
+	( cd src/binding/fortran/use_mpi && chmod a+x ./buildiface && ./buildiface )
+	( cd src/binding/fortran/use_mpi && ../mpif_h/buildiface -infile=cf90t.h -deffile=cf90tdefs)
 	echo "done"
     fi
 
diff --git a/configure.ac b/configure.ac
index 6b1f14a..e086df1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2098,15 +2098,15 @@ dnl compilers without creating a separate version.
 dnl Note that this is run AFTER the AC_OUTPUT actions
 AC_OUTPUT_COMMANDS([if test "$enable_f77" = yes ; then 
 if test "$has_exclaim" = "yes" ; then
-    sed -e 's/^C/\!/g' src/binding/f77/mpif.h > src/include/mpif.h
-	cp src/include/mpif.h src/binding/f77/mpif.h
+    sed -e 's/^C/\!/g' src/binding/fortran/mpif_h/mpif.h > src/include/mpif.h
+	cp src/include/mpif.h src/binding/fortran/mpif_h/mpif.h
 else
-    cp src/binding/f77/mpif.h src/include
+    cp src/binding/fortran/mpif_h/mpif.h src/include
 fi
 if test "$has_fort_real8" = "yes" ; then
     sed -e 's/DOUBLE PRECISION/REAL*8/g' src/include/mpif.h > src/include/mpif.h.new
     mv src/include/mpif.h.new src/include/mpif.h
-    cp src/include/mpif.h src/binding/f77/mpif.h
+    cp src/include/mpif.h src/binding/fortran/mpif_h/mpif.h
 fi
 fi],
 master_top_srcdir=$master_top_srcdir
@@ -2123,7 +2123,7 @@ if test "$enable_fc" = "yes" ; then
         AC_MSG_WARN([Fortran 90 requires Fortran 77])
         enable_fc=no
     else 
-        bindingsubsystems="$bindingsubsystems src/binding/f90"
+        bindingsubsystems="$bindingsubsystems src/binding/fortran/use_mpi"
         bindings="$bindings f90"
     fi
 fi
@@ -3075,7 +3075,7 @@ if test "$len_long_double" != 0 -a "$MPID_NO_LONG_DOUBLE" != yes ; then
 else
     MPI_LONG_DOUBLE=MPI_DATATYPE_NULL
 fi
-# If you change MPI_BYTE, you must change it in src/binding/f77/buildiface
+# If you change MPI_BYTE, you must change it in src/binding/fortran/mpif_h/buildiface
 MPI_BYTE="0x4c00010d"
 MPI_WCHAR="0x4c00${len_wchar_t}0e"
 MPI_PACKED="0x4c00010f"
@@ -3907,7 +3907,7 @@ dnl     len_doublecplx=$hexlen
 	# interface (was error)
 	# Check to see if the f77 binding has enabled the code to support
 	# the case of int != fint. 
-	if grep HAVE_FINT_IS_INT $master_top_srcdir/src/binding/f77/testf.c 2>&1 1>/dev/null ; then
+	if grep HAVE_FINT_IS_INT $master_top_srcdir/src/binding/fortran/mpif_h/testf.c 2>&1 1>/dev/null ; then
 	    AC_MSG_WARN([Fortran integers and C ints are not the same size.  Support for this case is experimental; use at your own risk])
 	else 
             AC_MSG_ERROR([Fortran integers and C ints are not the same size.  The current Fortran binding does not support this case.  Either force the Fortran compiler to use integers of $ac_cv_sizeof_int bytes, or use --disable-f77 on the configure line for MPICH.])
@@ -5786,7 +5786,7 @@ fi
 
 dnl FIXME XXX DJG does this need to actually be conditional on something?
 dnl previously it was conditional on the successful execution of
-dnl "src/binding/f90/configure" but that would only fail if FC couldn't be
+dnl "src/binding/fortran/use_mpi/configure" but that would only fail if FC couldn't be
 dnl determined or a bad VPATH build env was detected
 AC_DEFINE(HAVE_FC_TYPE_ROUTINES,1,[Define if Fortran 90 type routines available])
 
@@ -5907,7 +5907,7 @@ if test -z "$libbuild_dir" ; then
 fi
 if test -z "$modincbuild_dir" ; then
     # The include files may be in a different directory from the mpif.h file
-    modincbuild_dir=`pwd`/src/binding/f90
+    modincbuild_dir=`pwd`/src/binding/fortran/use_mpi
 fi
 
 dnl
@@ -6021,12 +6021,12 @@ AC_OUTPUT(Makefile \
           src/include/glue_romio.h \
           src/include/mpichtimer.h \
           src/binding/cxx/mpicxx.h \
-	  src/binding/f77/mpif.h \
-	  src/binding/f77/setbotf.f \
-	  src/binding/f77/setbot.c \
-	  src/binding/f90/mpi_sizeofs.f90 \
-	  src/binding/f90/mpi_base.f90 \
-	  src/binding/f90/mpi_constants.f90 \
+	  src/binding/fortran/mpif_h/mpif.h \
+	  src/binding/fortran/mpif_h/setbotf.f \
+	  src/binding/fortran/mpif_h/setbot.c \
+	  src/binding/fortran/use_mpi/mpi_sizeofs.f90 \
+	  src/binding/fortran/use_mpi/mpi_base.f90 \
+	  src/binding/fortran/use_mpi/mpi_constants.f90 \
 	  src/packaging/pkgconfig/mpich.pc \
 	  src/packaging/envmods/mpich.module \
           src/env/mpixxx_opts.conf \
diff --git a/src/binding/Makefile.mk b/src/binding/Makefile.mk
index 94c4fa8..c102f9f 100644
--- a/src/binding/Makefile.mk
+++ b/src/binding/Makefile.mk
@@ -6,6 +6,6 @@
 ##
 
 include $(top_srcdir)/src/binding/cxx/Makefile.mk
-include $(top_srcdir)/src/binding/f77/Makefile.mk
-include $(top_srcdir)/src/binding/f90/Makefile.mk
+include $(top_srcdir)/src/binding/fortran/mpif_h/Makefile.mk
+include $(top_srcdir)/src/binding/fortran/use_mpi/Makefile.mk
 
diff --git a/src/binding/f77/buildiface b/src/binding/fortran/mpif_h/buildiface
similarity index 99%
rename from src/binding/f77/buildiface
rename to src/binding/fortran/mpif_h/buildiface
index ce278bc..024baca 100755
--- a/src/binding/f77/buildiface
+++ b/src/binding/fortran/mpif_h/buildiface
@@ -68,7 +68,7 @@ $do_logical = 1;
 $do_weak    = 1;
 $do_subdecls = 1;
 $do_bufptr = 1;
-$prototype_file = "../../include/mpi.h.in";
+$prototype_file = "../../../include/mpi.h.in";
 
 # Global hashes used for definitions and to record the locations of the
 # defintions.
@@ -946,11 +946,11 @@ if ($build_prototypes) {
 &ReadAndProcessInterface( $prototype_file, 0 );
 
 # if doing MPI2, we also need to read the MPI-2 protottypes
-if ( -s "../../mpi/romio/include/mpio.h.in" && $build_io) { 
+if ( -s "../../../mpi/romio/include/mpio.h.in" && $build_io) {
     %skipBlocks = ( 'HAVE_MPI_DARRAY_SUBARRAY' => 1, 
  	 	    'HAVE_MPI_INFO' => 1,
 		    'MPICH' => 1 );
-    &ReadAndProcessInterface( "../../mpi/romio/include/mpio.h.in", 1 );
+    &ReadAndProcessInterface( "../../../mpi/romio/include/mpio.h.in", 1 );
     %skipBlocks = ();
 }
 
@@ -998,15 +998,15 @@ EOT
 
     print MAKEFD <<EOT;
 # ensure that the buildiface script ends up in the release tarball
-EXTRA_DIST += src/binding/f77/buildiface
+EXTRA_DIST += src/binding/fortran/mpif_h/buildiface
 
 # FIXME need to add proper rules to rebuild the fortran sources generated by
 # buildiface when buildiface is updated
 if MAINTAINER_MODE
-\$(top_srcdir)/src/binding/f77/Makefile.mk: src/binding/f77/buildiface-stamp
+\$(top_srcdir)/src/binding/fortran/mpif_h/Makefile.mk: src/binding/fortran/mpif_h/buildiface-stamp
 
-src/binding/f77/buildiface-stamp: \$(top_srcdir)/src/binding/f77/buildiface \$(top_srcdir)/src/include/mpi.h.in
-	( cd \$(top_srcdir)/src/binding/f77 && ./buildiface )
+src/binding/fortran/mpif_h/buildiface-stamp: \$(top_srcdir)/src/binding/fortran/mpif_h/buildiface \$(top_srcdir)/src/include/mpi.h.in
+	( cd \$(top_srcdir)/src/binding/fortran/mpif_h && ./buildiface )
 endif MAINTAINER_MODE
 
 mpi_f77_sources =
@@ -1015,7 +1015,7 @@ EOT
     &print_line(  MAKEFD, "mpi_f77_sources += ", 80, "\\\n\t", 8 );
     for ($i=0; $i<=$#files; $i++) {
 	$name = $files[$i];
-	&print_line( MAKEFD, "src/binding/f77/$name ", 80, "\\\n\t", 8 );
+	&print_line( MAKEFD, "src/binding/fortran/mpif_h/$name ", 80, "\\\n\t", 8 );
     }
     &print_endline( MAKEFD );
 
@@ -1026,19 +1026,19 @@ EOT
 # clobber flags set by other parts of MPICH, and we don't want to re-add that
 # lib to the lib_LTLIBRARIES list
 #lib_LTLIBRARIES += lib/lib\@MPIFLIBNAME\@.la
-#lib_lib\@MPIFLIBNAME\@_la_SOURCES = \$(mpi_f77_sources) src/binding/f77/setbot.c src/binding/f77/setbotf.f src/binding/f77/fdebug.c
-#lib_lib\@MPIFLIBNAME\@_la_CPPFLAGS = -I\${master_top_srcdir}/src/binding/f77
-lib_lib\@MPILIBNAME\@_la_SOURCES += \$(mpi_f77_sources) src/binding/f77/fdebug.c
+#lib_lib\@MPIFLIBNAME\@_la_SOURCES = \$(mpi_f77_sources) src/binding/fortran/mpif_h/setbot.c src/binding/fortran/mpif_h/setbotf.f src/binding/fortran/mpif_h/fdebug.c
+#lib_lib\@MPIFLIBNAME\@_la_CPPFLAGS = -I\${master_top_srcdir}/src/binding/fortran/mpif_h
+lib_lib\@MPILIBNAME\@_la_SOURCES += \$(mpi_f77_sources) src/binding/fortran/mpif_h/fdebug.c
 
 # these files are created by config.status from ".in" files
-nodist_lib_lib\@MPILIBNAME\@_la_SOURCES += src/binding/f77/setbot.c src/binding/f77/setbotf.f
+nodist_lib_lib\@MPILIBNAME\@_la_SOURCES += src/binding/fortran/mpif_h/setbot.c src/binding/fortran/mpif_h/setbotf.f
 
 # FIXME does AM_CPPFLAGS need to be included elsewhere somehow in the
 # target-specific variable?
-AM_CPPFLAGS += -I\${master_top_srcdir}/src/binding/f77
+AM_CPPFLAGS += -I\${master_top_srcdir}/src/binding/fortran/mpif_h
 
 
-noinst_HEADERS += src/binding/f77/fproto.h src/binding/f77/mpi_fortimpl.h
+noinst_HEADERS += src/binding/fortran/mpif_h/fproto.h src/binding/fortran/mpif_h/mpi_fortimpl.h
 
 if BUILD_PROFILING_LIB
 # FIXME tension here: PMPIFLIBNAME is always "pmpich", so we don't want to
@@ -1046,17 +1046,17 @@ if BUILD_PROFILING_LIB
 # lib to the lib_LTLIBRARIES list
 #lib_LTLIBRARIES += lib/lib\@PMPIFLIBNAME\@.la
 #lib_lib\@PMPIFLIBNAME\@_la_SOURCES += \$(mpi_f77_sources)
-#lib_lib\@PMPIFLIBNAME\@_la_CPPFLAGS += -I\${master_top_srcdir}/src/binding/f77
+#lib_lib\@PMPIFLIBNAME\@_la_CPPFLAGS += -I\${master_top_srcdir}/src/binding/fortran/mpif_h
 lib_lib\@PMPILIBNAME\@_la_SOURCES += \$(mpi_f77_sources)
-#lib_lib\@PMPILIBNAME\@_la_CPPFLAGS += -I\${master_top_srcdir}/src/binding/f77
+#lib_lib\@PMPILIBNAME\@_la_CPPFLAGS += -I\${master_top_srcdir}/src/binding/fortran/mpif_h
 endif BUILD_PROFILING_LIB
 
-# config.status copies src/binding/f77/mpif.h to src/include (see the relevant
+# config.status copies src/binding/fortran/mpif_h/mpif.h to src/include (see the relevant
 # AC_OUTPUT_COMMANDS in configure.ac), so we need to delete it at distclean time
 # too.  More work is needed in this Makefile.mk to keep src/include/mpif.h up to
-# date w.r.t. the src/binding/f77 version.
-DISTCLEANFILES += src/binding/f77/mpif.h src/include/mpif.h
-nodist_include_HEADERS += src/binding/f77/mpif.h
+# date w.r.t. the src/binding/fortran/mpif_h version.
+DISTCLEANFILES += src/binding/fortran/mpif_h/mpif.h src/include/mpif.h
+nodist_include_HEADERS += src/binding/fortran/mpif_h/mpif.h
 
 # FIXME disabled for now, need to re-enable it the "autotools way"
 ## Documentation sources
@@ -3741,11 +3741,11 @@ sub print_special_decls {
 # and mpio.h.in (or other files)
 
 &ReadInterfaceForDefinitions( $prototype_file );
-if ( -s "../../mpi/romio/include/mpio.h.in" && $build_io) { 
+if ( -s "../../../mpi/romio/include/mpio.h.in" && $build_io) {
     %skipBlocks = ( 'HAVE_MPI_DARRAY_SUBARRAY' => 1, 
 		   'HAVE_MPI_INFO' => 1,
 		    'MPICH' => 1 );
-    &ReadInterfaceForDefinitions( "../../mpi/romio/include/mpio.h.in" );
+    &ReadInterfaceForDefinitions( "../../../mpi/romio/include/mpio.h.in" );
     %skipBlocks = ();
 }
 #
diff --git a/src/binding/f77/fdebug.c b/src/binding/fortran/mpif_h/fdebug.c
similarity index 100%
rename from src/binding/f77/fdebug.c
rename to src/binding/fortran/mpif_h/fdebug.c
diff --git a/src/binding/f77/mpi_fortimpl.h b/src/binding/fortran/mpif_h/mpi_fortimpl.h
similarity index 100%
rename from src/binding/f77/mpi_fortimpl.h
rename to src/binding/fortran/mpif_h/mpi_fortimpl.h
diff --git a/src/binding/f77/mpichf.def b/src/binding/fortran/mpif_h/mpichf.def
similarity index 100%
rename from src/binding/f77/mpichf.def
rename to src/binding/fortran/mpif_h/mpichf.def
diff --git a/src/binding/f77/mpichff.vfproj b/src/binding/fortran/mpif_h/mpichff.vfproj
similarity index 100%
rename from src/binding/f77/mpichff.vfproj
rename to src/binding/fortran/mpif_h/mpichff.vfproj
diff --git a/src/binding/f77/mpichfg.def b/src/binding/fortran/mpif_h/mpichfg.def
similarity index 100%
rename from src/binding/f77/mpichfg.def
rename to src/binding/fortran/mpif_h/mpichfg.def
diff --git a/src/binding/f77/mpichfs.def b/src/binding/fortran/mpif_h/mpichfs.def
similarity index 100%
rename from src/binding/f77/mpichfs.def
rename to src/binding/fortran/mpif_h/mpichfs.def
diff --git a/src/binding/f77/setbot.c.in b/src/binding/fortran/mpif_h/setbot.c.in
similarity index 100%
rename from src/binding/f77/setbot.c.in
rename to src/binding/fortran/mpif_h/setbot.c.in
diff --git a/src/binding/f77/setbotf.f.in b/src/binding/fortran/mpif_h/setbotf.f.in
similarity index 100%
rename from src/binding/f77/setbotf.f.in
rename to src/binding/fortran/mpif_h/setbotf.f.in
diff --git a/src/binding/f90/binding.sub b/src/binding/fortran/use_mpi/binding.sub
similarity index 100%
rename from src/binding/f90/binding.sub
rename to src/binding/fortran/use_mpi/binding.sub
diff --git a/src/binding/f90/buildiface b/src/binding/fortran/use_mpi/buildiface
similarity index 90%
rename from src/binding/f90/buildiface
rename to src/binding/fortran/use_mpi/buildiface
index b1eb8b1..bfa3e78 100755
--- a/src/binding/f90/buildiface
+++ b/src/binding/fortran/use_mpi/buildiface
@@ -30,7 +30,7 @@ require "$mydir/binding.sub";
 $arg_string = join( ' ', @ARGV );
 $gDebug = 0;
 
-$prototype_file = "../../include/mpi.h.in";
+$prototype_file = "../../../include/mpi.h.in";
 $is_MPI = 1;
 $buildMPIX = 0;
 $routine_prefix = "MPI_";
@@ -673,7 +673,7 @@ $PRIVATEVAR = "";
 # alignment restrictions may introduce padding in the structure
 # And one more problem: If a Fortran INTEGER is not the same as a C int,
 # then these are also wrong (see the "fint" option in
-# src/binding/f77/buildiface
+# src/binding/fortran/mpif_h/buildiface
 print MPIFD <<EOT;
         TYPE$BINDACCESS :: MPI_Status
            $BINDDEF
@@ -897,19 +897,19 @@ print MAKEFD "FC_COMPILE_MODS  = \$(LTFCCOMPILE)\n";
 print MAKEFD <<EOT;
 
 # ensure that the buildiface script ends up in the release tarball
-EXTRA_DIST += src/binding/f90/buildiface
+EXTRA_DIST += src/binding/fortran/use_mpi/buildiface
 
-# additional perl files that are "require"d by f90/buildiface and
-# f77/buildiface, respectively
-EXTRA_DIST += src/binding/f90/binding.sub src/binding/f90/cf90tdefs
+# additional perl files that are "require"d by use_mpi/buildiface and
+# mpif_h/buildiface, respectively
+EXTRA_DIST += src/binding/fortran/use_mpi/binding.sub src/binding/fortran/use_mpi/cf90tdefs
 
 # FIXME need to add proper rules to rebuild the fortran sources generated by
 # buildiface when buildiface is updated
 if MAINTAINER_MODE
-\$(top_srcdir)/src/binding/f90/Makefile.mk: src/binding/f90/buildiface-stamp
+\$(top_srcdir)/src/binding/fortran/use_mpi/Makefile.mk: src/binding/fortran/use_mpi/buildiface-stamp
 
-src/binding/f90/buildiface-stamp: \$(top_srcdir)/src/binding/f90/buildiface \$(top_srcdir)/src/include/mpi.h.in
-\t( cd \$(top_srcdir)/src/binding/f90 && ./buildiface )
+src/binding/fortran/use_mpi/buildiface-stamp: \$(top_srcdir)/src/binding/fortran/use_mpi/buildiface \$(top_srcdir)/src/include/mpi.h.in
+\t( cd \$(top_srcdir)/src/binding/fortran/use_mpi && ./buildiface )
 endif MAINTAINER_MODE
 
 # variables for custom "silent-rules" for F90 modules
@@ -922,7 +922,7 @@ if BUILD_F90_LIB
 # We need to tell some compilers (e.g., Solaris f90) to look for modules in the
 # current directory when the source file is not in the working directory (i.e.,
 # in a VPATH build)
-AM_FCFLAGS += \@FCINCFLAG\@src/binding/f90
+AM_FCFLAGS += \@FCINCFLAG\@src/binding/fortran/use_mpi
 
 lib_LTLIBRARIES += lib/lib\@FCWRAPNAME\@.la
 
@@ -934,51 +934,51 @@ print MAKEFD <<EOT;
 # for inclusion in libpmpich.la on platforms that do not support weak symbols.
 # If shared libraries are enabled then the compilation space doubles again.
 mpi_f90_c_sources = \\
-    src/binding/f90/create_f90_int.c \\
-    src/binding/f90/create_f90_real.c \\
-    src/binding/f90/create_f90_complex.c \\
-    src/binding/f90/typef90cmplxf.c \\
-    src/binding/f90/typef90realf.c \\
-    src/binding/f90/typef90intf.c
+    src/binding/fortran/use_mpi/create_f90_int.c \\
+    src/binding/fortran/use_mpi/create_f90_real.c \\
+    src/binding/fortran/use_mpi/create_f90_complex.c \\
+    src/binding/fortran/use_mpi/typef90cmplxf.c \\
+    src/binding/fortran/use_mpi/typef90realf.c \\
+    src/binding/fortran/use_mpi/typef90intf.c
 
 mpi_sources += \$(mpi_f90_c_sources)
 
 # utility code that has no PMPI equivalent
-lib_lib\@MPILIBNAME\@_la_SOURCES += src/binding/f90/create_f90_util.c
-AM_CPPFLAGS += -Isrc/binding/f90
+lib_lib\@MPILIBNAME\@_la_SOURCES += src/binding/fortran/use_mpi/create_f90_util.c
+AM_CPPFLAGS += -Isrc/binding/fortran/use_mpi
 noinst_HEADERS +=                     \\
-    src/binding/f90/create_f90_util.h \\
-    src/binding/f90/cf90t.h           \\
-    src/binding/f90/mpif90type.h      \\
-    src/binding/f90/mpifnoext.h
+    src/binding/fortran/use_mpi/create_f90_util.h \\
+    src/binding/fortran/use_mpi/cf90t.h           \\
+    src/binding/fortran/use_mpi/mpif90type.h      \\
+    src/binding/fortran/use_mpi/mpifnoext.h
 
 nodist_noinst_HEADERS += \\
-    src/binding/f90/mpif90model.h
+    src/binding/fortran/use_mpi/mpif90model.h
 
 # actual f90 code that also gets compiled into modules
 lib_lib\@FCWRAPNAME\@_la_LDFLAGS = \$(ABIVERSIONFLAGS)
 
 # cause any .\$(MOD) files to be output in the f90 bindings directory instead of
 # the current directory
-AM_FCFLAGS += \$(FCMODOUTFLAG)src/binding/f90
+AM_FCFLAGS += \$(FCMODOUTFLAG)src/binding/fortran/use_mpi
 
 # we "manually" build the f90 sources and add them with LIBADD
 lib_lib\@FCWRAPNAME\@_la_SOURCES =
 lib_lib\@FCWRAPNAME\@_la_LIBADD = \\
-    src/binding/f90/mpi.lo \\
-    src/binding/f90/mpi_constants.lo \\
-    src/binding/f90/mpi_sizeofs.lo \\
-    src/binding/f90/${outfile_prefix}_base.lo
+    src/binding/fortran/use_mpi/mpi.lo \\
+    src/binding/fortran/use_mpi/mpi_constants.lo \\
+    src/binding/fortran/use_mpi/mpi_sizeofs.lo \\
+    src/binding/fortran/use_mpi/${outfile_prefix}_base.lo
 
 # now force libtool FC rules/variables to be generated and cause FC linking to
 # be selected for lib/lib\@FCWRAPNAME\@.la
 EXTRA_lib_lib\@FCWRAPNAME\@_la_SOURCES = \\
-    src/binding/f90/mpi.f90 \\
-    src/binding/f90/mpi_constants.f90
+    src/binding/fortran/use_mpi/mpi.f90 \\
+    src/binding/fortran/use_mpi/mpi_constants.f90
 
 nodist_EXTRA_lib_lib\@FCWRAPNAME\@_la_SOURCES = \\
-    src/binding/f90/mpi_sizeofs.f90 \\
-    src/binding/f90/${outfile_prefix}_base.f90
+    src/binding/fortran/use_mpi/mpi_sizeofs.f90 \\
+    src/binding/fortran/use_mpi/${outfile_prefix}_base.f90
 
 EOT
 
@@ -994,38 +994,38 @@ print MAKEFD <<EOT;
 EOT
 
 #print MAKEFD <<EOT;
-#src/binding/f90/\$(MPIMOD).\$(MOD): src/binding/f90/\$(MPICONSTMOD).\$(MOD) src/binding/f90/\$(MPISIZEOFMOD).\$(MOD) \\
-#\t\t  src/binding/f90/\$(MPIBASEMOD).\$(MOD) \$(srcdir)/src/binding/f90/mpi.f90 src/binding/f90/mpifnoext.h
+#src/binding/fortran/use_mpi/\$(MPIMOD).\$(MOD): src/binding/fortran/use_mpi/\$(MPICONSTMOD).\$(MOD) src/binding/fortran/use_mpi/\$(MPISIZEOFMOD).\$(MOD) \\
+#\t\t  src/binding/fortran/use_mpi/\$(MPIBASEMOD).\$(MOD) \$(srcdir)/src/binding/fortran/use_mpi/mpi.f90 src/binding/fortran/use_mpi/mpifnoext.h
 #EOT
 #&createModSteps('mpi.f90', 1);
-createModSteps('src/binding/f90/$(MPIMOD).$(MOD)',
-               join(' ', ('src/binding/f90/$(MPICONSTMOD).$(MOD)',
-                          'src/binding/f90/$(MPISIZEOFMOD).$(MOD)',
-                          'src/binding/f90/$(MPIBASEMOD).$(MOD)',
-                          '$(srcdir)/src/binding/f90/mpi.f90',
-                          'src/binding/f90/mpifnoext.h')
+createModSteps('src/binding/fortran/use_mpi/$(MPIMOD).$(MOD)',
+               join(' ', ('src/binding/fortran/use_mpi/$(MPICONSTMOD).$(MOD)',
+                          'src/binding/fortran/use_mpi/$(MPISIZEOFMOD).$(MOD)',
+                          'src/binding/fortran/use_mpi/$(MPIBASEMOD).$(MOD)',
+                          '$(srcdir)/src/binding/fortran/use_mpi/mpi.f90',
+                          'src/binding/fortran/use_mpi/mpifnoext.h')
                ),
                'mpi.f90',
                1);
 
-#print MAKEFD "src/binding/f90/\$(MPICONSTMOD).\$(MOD): \$(srcdir)/src/binding/f90/mpi_constants.f90 src/binding/f90/mpifnoext.h\n";
+#print MAKEFD "src/binding/fortran/use_mpi/\$(MPICONSTMOD).\$(MOD): \$(srcdir)/src/binding/fortran/use_mpi/mpi_constants.f90 src/binding/fortran/use_mpi/mpifnoext.h\n";
 #&createModSteps('mpi_constants.f90', 1);
-createModSteps('src/binding/f90/$(MPICONSTMOD).$(MOD)',
-               'src/binding/f90/mpi_constants.f90 src/binding/f90/mpifnoext.h',
+createModSteps('src/binding/fortran/use_mpi/$(MPICONSTMOD).$(MOD)',
+               'src/binding/fortran/use_mpi/mpi_constants.f90 src/binding/fortran/use_mpi/mpifnoext.h',
                'mpi_constants.f90',
                1);
 
-#print MAKEFD "src/binding/f90/\$(MPISIZEOFMOD).\$(MOD): src/binding/f90/mpi_sizeofs.f90 src/binding/f90/mpifnoext.h\n";
+#print MAKEFD "src/binding/fortran/use_mpi/\$(MPISIZEOFMOD).\$(MOD): src/binding/fortran/use_mpi/mpi_sizeofs.f90 src/binding/fortran/use_mpi/mpifnoext.h\n";
 #&createModSteps("mpi_sizeofs.f90", 0);
-createModSteps('src/binding/f90/$(MPISIZEOFMOD).$(MOD)',
-               'src/binding/f90/mpi_sizeofs.f90 src/binding/f90/mpifnoext.h',
+createModSteps('src/binding/fortran/use_mpi/$(MPISIZEOFMOD).$(MOD)',
+               'src/binding/fortran/use_mpi/mpi_sizeofs.f90 src/binding/fortran/use_mpi/mpifnoext.h',
                'mpi_sizeofs.f90',
                0);
 
-#print MAKEFD "src/binding/f90/\$(MPIBASEMOD).\$(MOD): src/binding/f90/${outfile_prefix}_base.f90 src/binding/f90/\$(MPICONSTMOD).\$(MOD)\n";
+#print MAKEFD "src/binding/fortran/use_mpi/\$(MPIBASEMOD).\$(MOD): src/binding/fortran/use_mpi/${outfile_prefix}_base.f90 src/binding/fortran/use_mpi/\$(MPICONSTMOD).\$(MOD)\n";
 #&createModSteps("${outfile_prefix}_base.f90", 0);
-createModSteps('src/binding/f90/$(MPIBASEMOD).$(MOD)',
-               "src/binding/f90/${outfile_prefix}_base.f90 src/binding/f90/\$(MPICONSTMOD).\$(MOD)",
+createModSteps('src/binding/fortran/use_mpi/$(MPIBASEMOD).$(MOD)',
+               "src/binding/fortran/use_mpi/${outfile_prefix}_base.f90 src/binding/fortran/use_mpi/\$(MPICONSTMOD).\$(MOD)",
                "${outfile_prefix}_base.f90",
                0);
 
@@ -1036,10 +1036,10 @@ createModSteps('src/binding/f90/$(MPIBASEMOD).$(MOD)',
 print MAKEFD <<EOT;
 
 mpi_f90_modules = \\
-    src/binding/f90/\$(MPIMOD).\$(MOD) \\
-    src/binding/f90/\$(MPISIZEOFMOD).\$(MOD) \\
-    src/binding/f90/\$(MPICONSTMOD).\$(MOD) \\
-    src/binding/f90/\$(MPIBASEMOD).\$(MOD)
+    src/binding/fortran/use_mpi/\$(MPIMOD).\$(MOD) \\
+    src/binding/fortran/use_mpi/\$(MPISIZEOFMOD).\$(MOD) \\
+    src/binding/fortran/use_mpi/\$(MPICONSTMOD).\$(MOD) \\
+    src/binding/fortran/use_mpi/\$(MPIBASEMOD).\$(MOD)
 
 # the modules are effectively precompiled headers for Fortran programs
 modinc_HEADERS = \$(mpi_f90_modules)
@@ -1049,14 +1049,14 @@ modinc_HEADERS = \$(mpi_f90_modules)
 # but leave MPI_WTIME_IS_GLOBAL).
 # Also allow REAL*8 or DOUBLE PRECISION for the MPI_WTIME/MPI_WTICK
 # declarations
-src/binding/f90/mpifnoext.h: src/binding/f77/mpif.h
+src/binding/fortran/use_mpi/mpifnoext.h: src/binding/fortran/mpif_h/mpif.h
 \trm -f \$@
 \tsed -e 's/^C/\\!/g' -e '/EXTERNAL/d' \\
 \t-e '/REAL\\*8/d' \\
 \t-e '/DOUBLE PRECISION/d' \\
-\t-e '/MPI_WTICK/d' src/binding/f77/mpif.h > \$@
+\t-e '/MPI_WTICK/d' src/binding/fortran/mpif_h/mpif.h > \$@
 
-CLEANFILES += src/binding/f90/mpifnoext.h
+CLEANFILES += src/binding/fortran/use_mpi/mpifnoext.h
 
 EOT
 
@@ -1150,8 +1150,8 @@ sub createModSteps {
     $noext =~ s/\.f90$//;
 
     # filenames used by the make target
-    my $stamp = "src/binding/f90/${noext}.\$(MOD)-stamp";
-    my $lockfile = "src/binding/f90/${noext}-lock";
+    my $stamp = "src/binding/fortran/use_mpi/${noext}.\$(MOD)-stamp";
+    my $lockfile = "src/binding/fortran/use_mpi/${noext}-lock";
 
     # This code formerly supported the Intel Fortran Compiler's curious
     # "-cl,blah.pcl" argument in a fragile and complicated way.  Since this
@@ -1184,19 +1184,19 @@ sub createModSteps {
 
     print MAKEFD <<EOT;
 ${stamp}: ${deps}
-\t\@rm -f src/binding/f90/${noext}-tmp
-\t\@touch src/binding/f90/${noext}-tmp
+\t\@rm -f src/binding/fortran/use_mpi/${noext}-tmp
+\t\@touch src/binding/fortran/use_mpi/${noext}-tmp
 EOT
 
     if ($use_srcdir) {
         print MAKEFD <<EOT;
-\t\@( cd src/binding/f90 && \\
+\t\@( cd src/binding/fortran/use_mpi && \\
 \t   if [ \"\$(FCEXT)\" != \"f90\" ] || [ ! -f $srcFileWithExt ] ; then \\
 \t       rm -f $srcFileWithExt ; \\
-\t       \$(LN_S) \$(abs_top_srcdir)/src/binding/f90/$srcFile $srcFileWithExt ; \\
+\t       \$(LN_S) \$(abs_top_srcdir)/src/binding/fortran/use_mpi/$srcFile $srcFileWithExt ; \\
 \t   fi )
-\t\$(mod_verbose)\$(FC_COMPILE_MODS) -c src/binding/f90/$srcFileWithExt -o src/binding/f90/$loFile
-\t\@( cd src/binding/f90 && \\
+\t\$(mod_verbose)\$(FC_COMPILE_MODS) -c src/binding/fortran/use_mpi/$srcFileWithExt -o src/binding/fortran/use_mpi/$loFile
+\t\@( cd src/binding/fortran/use_mpi && \\
 \t   if [ \"\$(FCEXT)\" != \"f90\" ] || [ ! -f $srcFileWithExt ] ; then \\
 \t       rm -f $srcFileWithExt ; \\
 \t   fi )
@@ -1204,13 +1204,13 @@ EOT
     }
     else {
         print MAKEFD <<EOT;
-\t\@( cd src/binding/f90 && \\
+\t\@( cd src/binding/fortran/use_mpi && \\
 \t   if [ \"\$(FCEXT)\" != \"f90\" ] ; then \\
 \t       rm -f $srcFileWithExt ; \\
 \t       \$(LN_S) $srcFile $srcFileWithExt ; \\
 \t   fi )
-\t\$(mod_verbose)\$(FC_COMPILE_MODS) -c src/binding/f90/$srcFileWithExt -o src/binding/f90/$loFile
-\t\@( cd src/binding/f90 && \\
+\t\$(mod_verbose)\$(FC_COMPILE_MODS) -c src/binding/fortran/use_mpi/$srcFileWithExt -o src/binding/fortran/use_mpi/$loFile
+\t\@( cd src/binding/fortran/use_mpi && \\
 \t   if [ \"\$(FCEXT)\" != \"f90\" ] ; then \\
 \t       rm -f $srcFileWithExt ; \\
 \t   fi )
@@ -1218,9 +1218,9 @@ EOT
     }
 
     print MAKEFD <<EOT;
-\t\@mv src/binding/f90/${noext}-tmp ${stamp}
+\t\@mv src/binding/fortran/use_mpi/${noext}-tmp ${stamp}
 
-src/binding/f90/${loFile} ${module}: ${stamp}
+src/binding/fortran/use_mpi/${loFile} ${module}: ${stamp}
 ## Recover from the removal of \$\@
 \t\@if test -f \$\@; then :; else \\
 \t  trap 'rm -rf ${lockfile} ${stamp}' 1 2 13 15; \\
@@ -1238,7 +1238,7 @@ src/binding/f90/${loFile} ${module}: ${stamp}
 \t  fi; \\
 \tfi
 
-CLEANFILES += ${stamp} ${module} src/binding/f90/${loFile} src/binding/f90/${noext}-tmp
+CLEANFILES += ${stamp} ${module} src/binding/fortran/use_mpi/${loFile} src/binding/fortran/use_mpi/${noext}-tmp
 
 
 EOT
diff --git a/src/binding/f90/cf90t.h b/src/binding/fortran/use_mpi/cf90t.h
similarity index 100%
rename from src/binding/f90/cf90t.h
rename to src/binding/fortran/use_mpi/cf90t.h
diff --git a/src/binding/f90/cf90tdefs b/src/binding/fortran/use_mpi/cf90tdefs
similarity index 87%
rename from src/binding/f90/cf90tdefs
rename to src/binding/fortran/use_mpi/cf90tdefs
index d9f2fbb..820ab30 100644
--- a/src/binding/f90/cf90tdefs
+++ b/src/binding/fortran/use_mpi/cf90tdefs
@@ -6,7 +6,7 @@ $build_io = 0;
 # But we do need the the weak and profiling support
 $do_weak = 1;
 $do_profiling = 1;
-$header_file = "../f77/mpi_fortimpl.h";
+$header_file = "../mpif_h/mpi_fortimpl.h";
 $build_prototypes = 1;
 $prototype_header_file = "mpif90type.h";
 #$debug = 1;
diff --git a/src/binding/f90/create_f90_complex.c b/src/binding/fortran/use_mpi/create_f90_complex.c
similarity index 100%
rename from src/binding/f90/create_f90_complex.c
rename to src/binding/fortran/use_mpi/create_f90_complex.c
diff --git a/src/binding/f90/create_f90_int.c b/src/binding/fortran/use_mpi/create_f90_int.c
similarity index 100%
rename from src/binding/f90/create_f90_int.c
rename to src/binding/fortran/use_mpi/create_f90_int.c
diff --git a/src/binding/f90/create_f90_real.c b/src/binding/fortran/use_mpi/create_f90_real.c
similarity index 100%
rename from src/binding/f90/create_f90_real.c
rename to src/binding/fortran/use_mpi/create_f90_real.c
diff --git a/src/binding/f90/create_f90_util.c b/src/binding/fortran/use_mpi/create_f90_util.c
similarity index 100%
rename from src/binding/f90/create_f90_util.c
rename to src/binding/fortran/use_mpi/create_f90_util.c
diff --git a/src/binding/f90/create_f90_util.h b/src/binding/fortran/use_mpi/create_f90_util.h
similarity index 100%
rename from src/binding/f90/create_f90_util.h
rename to src/binding/fortran/use_mpi/create_f90_util.h
diff --git a/src/binding/f90/manf90.txt b/src/binding/fortran/use_mpi/manf90.txt
similarity index 100%
rename from src/binding/f90/manf90.txt
rename to src/binding/fortran/use_mpi/manf90.txt
diff --git a/src/binding/f90/mpi_sizeofs.f90.in b/src/binding/fortran/use_mpi/mpi_sizeofs.f90.in
similarity index 100%
rename from src/binding/f90/mpi_sizeofs.f90.in
rename to src/binding/fortran/use_mpi/mpi_sizeofs.f90.in
diff --git a/src/binding/f90/mpif90.vfproj b/src/binding/fortran/use_mpi/mpif90.vfproj
similarity index 100%
rename from src/binding/f90/mpif90.vfproj
rename to src/binding/fortran/use_mpi/mpif90.vfproj
diff --git a/src/binding/f90/mpif90model.h.in b/src/binding/fortran/use_mpi/mpif90model.h.in
similarity index 100%
rename from src/binding/f90/mpif90model.h.in
rename to src/binding/fortran/use_mpi/mpif90model.h.in
diff --git a/src/binding/f90/subconfigure.m4 b/src/binding/fortran/use_mpi/subconfigure.m4
similarity index 96%
rename from src/binding/f90/subconfigure.m4
rename to src/binding/fortran/use_mpi/subconfigure.m4
index 538b3f2..65a776d 100644
--- a/src/binding/f90/subconfigure.m4
+++ b/src/binding/fortran/use_mpi/subconfigure.m4
@@ -9,7 +9,7 @@ AM_CONDITIONAL([BUILD_F90_LIB],[test "X$enable_fc" = "Xyes"])
 AC_DEFUN([PAC_SUBCFG_BODY_]PAC_SUBCFG_AUTO_SUFFIX,[
 
 AM_COND_IF([BUILD_F90_LIB],[
-# FIXME XXX DJG this code came from a sub-configure in src/binding/f90.  Why
+# FIXME XXX DJG this code came from a sub-configure in src/binding/fortran/use_mpi.  Why
 # isn't this just all up in the top-level configure?  Alternatively, why doesn't
 # most/all of the f90 configure code from the top level configure.ac live here
 # instead?  Is it because of the c/f77/f90 interplay?
@@ -58,7 +58,7 @@ PAC_FC_INTEGER_MODEL_MAP([FC_INTEGER_MODEL_MAP],
                          [$CROSS_F90_INTEGER_MODEL_MAP])
 AC_SUBST(FC_INTEGER_MODEL_MAP)    
 
-AC_CONFIG_FILES([src/binding/f90/mpif90model.h])
+AC_CONFIG_FILES([src/binding/fortran/use_mpi/mpif90model.h])
 
 ])dnl end AM_COND_IF(BUILD_F90_LIB,...)
 ])dnl end _BODY

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                                         |   84 ++++++------
 autogen.sh                                         |   16 +-
 configure.ac                                       |   30 ++--
 src/binding/Makefile.mk                            |    4 +-
 src/binding/{f77 => fortran/mpif_h}/buildiface     |   44 +++---
 src/binding/{f77 => fortran/mpif_h}/fdebug.c       |    0
 src/binding/{f77 => fortran/mpif_h}/mpi_fortimpl.h |    0
 src/binding/{f77 => fortran/mpif_h}/mpichf.def     |    0
 src/binding/{f77 => fortran/mpif_h}/mpichff.vfproj |    0
 src/binding/{f77 => fortran/mpif_h}/mpichfg.def    |    0
 src/binding/{f77 => fortran/mpif_h}/mpichfs.def    |    0
 src/binding/{f77 => fortran/mpif_h}/setbot.c.in    |    0
 src/binding/{f77 => fortran/mpif_h}/setbotf.f.in   |    0
 src/binding/{f90 => fortran/use_mpi}/binding.sub   |    0
 src/binding/{f90 => fortran/use_mpi}/buildiface    |  140 ++++++++++----------
 src/binding/{f90 => fortran/use_mpi}/cf90t.h       |    0
 src/binding/{f90 => fortran/use_mpi}/cf90tdefs     |    2 +-
 .../{f90 => fortran/use_mpi}/create_f90_complex.c  |    0
 .../{f90 => fortran/use_mpi}/create_f90_int.c      |    0
 .../{f90 => fortran/use_mpi}/create_f90_real.c     |    0
 .../{f90 => fortran/use_mpi}/create_f90_util.c     |    0
 .../{f90 => fortran/use_mpi}/create_f90_util.h     |    0
 src/binding/{f90 => fortran/use_mpi}/manf90.txt    |    0
 .../{f90 => fortran/use_mpi}/mpi_sizeofs.f90.in    |    0
 src/binding/{f90 => fortran/use_mpi}/mpif90.vfproj |    0
 .../{f90 => fortran/use_mpi}/mpif90model.h.in      |    0
 .../{f90 => fortran/use_mpi}/subconfigure.m4       |    4 +-
 27 files changed, 162 insertions(+), 162 deletions(-)
 rename src/binding/{f77 => fortran/mpif_h}/buildiface (99%)
 rename src/binding/{f77 => fortran/mpif_h}/fdebug.c (100%)
 rename src/binding/{f77 => fortran/mpif_h}/mpi_fortimpl.h (100%)
 rename src/binding/{f77 => fortran/mpif_h}/mpichf.def (100%)
 rename src/binding/{f77 => fortran/mpif_h}/mpichff.vfproj (100%)
 rename src/binding/{f77 => fortran/mpif_h}/mpichfg.def (100%)
 rename src/binding/{f77 => fortran/mpif_h}/mpichfs.def (100%)
 rename src/binding/{f77 => fortran/mpif_h}/setbot.c.in (100%)
 rename src/binding/{f77 => fortran/mpif_h}/setbotf.f.in (100%)
 rename src/binding/{f90 => fortran/use_mpi}/binding.sub (100%)
 rename src/binding/{f90 => fortran/use_mpi}/buildiface (90%)
 rename src/binding/{f90 => fortran/use_mpi}/cf90t.h (100%)
 rename src/binding/{f90 => fortran/use_mpi}/cf90tdefs (87%)
 rename src/binding/{f90 => fortran/use_mpi}/create_f90_complex.c (100%)
 rename src/binding/{f90 => fortran/use_mpi}/create_f90_int.c (100%)
 rename src/binding/{f90 => fortran/use_mpi}/create_f90_real.c (100%)
 rename src/binding/{f90 => fortran/use_mpi}/create_f90_util.c (100%)
 rename src/binding/{f90 => fortran/use_mpi}/create_f90_util.h (100%)
 rename src/binding/{f90 => fortran/use_mpi}/manf90.txt (100%)
 rename src/binding/{f90 => fortran/use_mpi}/mpi_sizeofs.f90.in (100%)
 rename src/binding/{f90 => fortran/use_mpi}/mpif90.vfproj (100%)
 rename src/binding/{f90 => fortran/use_mpi}/mpif90model.h.in (100%)
 rename src/binding/{f90 => fortran/use_mpi}/subconfigure.m4 (96%)


hooks/post-receive
-- 
MPICH primary repository


More information about the commits mailing list