Remove unused mpicc.conf.in and friends.

configure.ac

@@ -712,7 +712,7 @@ PAC_ARG_STRICT
 
 # -----------------------------------------------------------------------------
 # First check that we have a clean build if we are doing a VPATH build
-PAC_VPATH_CHECK(src/include/mpi.h src/env/mpicc src/env/mpicc.conf,lib)
+PAC_VPATH_CHECK(src/include/mpi.h src/env/mpicc,lib)
 
 # ----------------------------------------------------------------------------
 # This test is complicated by the fact that top_srcdir is not set until
@@ -6196,16 +6196,12 @@ AC_OUTPUT(Makefile \
 	  src/packaging/envmods/mpich.module \
           src/env/mpixxx_opts.conf \
           src/env/mpicc.sh \
-	  src/env/mpicc.conf \
 	  src/env/mpicc.bash \
           src/env/mpicxx.sh \
-	  src/env/mpicxx.conf \
 	  src/env/mpicxx.bash \
 	  src/env/mpif77.sh \
-	  src/env/mpif77.conf \
 	  src/env/mpif77.bash \
 	  src/env/mpif90.sh \
-	  src/env/mpif90.conf \
 	  src/env/mpif90.bash \
           src/env/parkill \
 	  src/util/dbg/getfuncstack \

src/env/Makefile.mk

@@ -19,29 +19,20 @@ endif BUILD_PROFILING_LIB
 
 src_env_mpichversion_LDFLAGS = $(mpich_libtool_static_flag)
 
-sysconf_DATA += src/env/mpicc.conf
-
 if BUILD_F77_BINDING
 bin_SCRIPTS += src/env/mpif77
-sysconf_DATA += src/env/mpif77.conf
 endif BUILD_F77_BINDING
 
 if BUILD_F90_LIB
 bin_SCRIPTS += src/env/mpif90
-sysconf_DATA += src/env/mpif90.conf
 endif BUILD_F90_LIB
 
 if BUILD_CXX_LIB
 bin_SCRIPTS += src/env/mpicxx
-sysconf_DATA += src/env/mpicxx.conf
 endif BUILD_CXX_LIB
 
 # create a local copy of the compiler wrapper that will actually be installed
 if BUILD_BASH_SCRIPTS
-src/env/mpicc.bash: $(top_builddir)/src/env/mpicc.conf
-src/env/mpicxx.bash: $(top_builddir)/src/env/mpicxx.conf
-src/env/mpif77.bash: $(top_builddir)/src/env/mpif77.conf
-src/env/mpif90.bash: $(top_builddir)/src/env/mpif90.conf
 src/env/mpicc: $(top_builddir)/src/env/mpicc.bash
 	cp -p $? $@
 src/env/mpicxx: $(top_builddir)/src/env/mpicxx.bash
@@ -51,10 +42,6 @@ src/env/mpif77: $(top_builddir)/src/env/mpif77.bash
 src/env/mpif90: $(top_builddir)/src/env/mpif90.bash
 	cp -p $? $@
 else !BUILD_BASH_SCRIPTS
-src/env/mpicc.sh: $(top_builddir)/src/env/mpicc.conf
-src/env/mpicxx.sh: $(top_builddir)/src/env/mpicxx.conf
-src/env/mpif77.sh: $(top_builddir)/src/env/mpif77.conf
-src/env/mpif90.sh: $(top_builddir)/src/env/mpif90.conf
 src/env/mpicc: $(top_builddir)/src/env/mpicc.sh
 	cp -p $? $@
 src/env/mpicxx: $(top_builddir)/src/env/mpicxx.sh
@@ -81,4 +68,3 @@ wrapper_doc_src = src/env/mpicc.txt \
                   src/env/mpiexec.txt
 doc1_src_txt += $(wrapper_doc_src)
 EXTRA_DIST += $(wrapper_doc_src)
-

src/env/mpicc.conf.in

-#! /bin/sh
-#
-# This file contains configuration information for mpicc.  This is
-# essentially just the variable-initialization part of mpicc.
-# --------------------------------------------------------------------------
-# Set the default values of all variables.
-#
-# Directory locations: Fixed for any MPI implementation.
-# Set from the directory arguments to configure (e.g., --prefix=/usr/local)
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-sysconfdir=@sysconfdir@
-includedir=@includedir@
-libdir=@libdir@
-
-# Default settings for compiler, flags, and libraries.
-# Determined by a combination of environment variables and tests within
-# configure (e.g., determining whehter -lsocket is needee)
-CC="@CC@"
-CFLAGS="@WRAPPER_CFLAGS@"
-CPPFLAGS="@WRAPPER_CPPFLAGS@"
-LDFLAGS="@WRAPPER_LDFLAGS@"
-LIBS="@WRAPPER_LIBS@"
-MPICH_VERSION="@MPICH_VERSION@"

src/env/mpicxx.conf.in

-#! /bin/sh
-#
-# This file contains configuration information for mpicxx.  This is
-# essentially just the variable-initialization part of mpicxx.
-# --------------------------------------------------------------------------
-# Set the default values of all variables.
-#
-# Directory locations: Fixed for any MPI implementation.
-# Set from the directory arguments to configure (e.g., --prefix=/usr/local)
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-sysconfdir=@sysconfdir@
-includedir=@includedir@
-libdir=@libdir@
-
-# Default settings for compiler, flags, and libraries.
-# Determined by a combination of environment variables and tests within
-# configure (e.g., determining whehter -lsocket is needee)
-CXX="@CXX@"
-CXXFLAGS="@WRAPPER_CXXFLAGS@"
-LDFLAGS="@WRAPPER_LDFLAGS@"
-LIBS="@WRAPPER_LIBS@"
-MPICXXLIBNAME="@MPICXXLIBNAME@"
-MPICH_VERSION="@MPICH_VERSION@"

src/env/mpif77.conf.in

-#! /bin/sh
-#
-# This file contains configuration information for mpif77.  This is
-# essentially just the variable-initialization part of mpif77.
-# --------------------------------------------------------------------------
-# Set the default values of all variables.
-#
-# Directory locations: Fixed for any MPI implementation
-# Set from the directory arguments to configure (e.g., --prefix=/usr/local)
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-sysconfdir=@sysconfdir@
-includedir=@includedir@
-libdir=@libdir@
-
-# Default settings for compiler, flags, and libraries
-# Determined by a combination of environment variables and tests within
-# configure (e.g., determining whehter -lsocket is needee)
-F77="@F77@"
-F77CPP="@F77CPP@"
-FFLAGS="@WRAPPER_FFLAGS@"
-LDFLAGS="@WRAPPER_LDFLAGS@"
-LIBS="@WRAPPER_LIBS@"
-MPICH_VERSION="@MPICH_VERSION@"
-#
-# ----------------------------------------------------------------------------
-# We also keep track of properties of the compilation system.  These
-# are read by the top-level configure to initialize the Fortran types
-# within the mpi.h file.
-#
-# MPI Types for the Fortran types
-MPI_COMPLEX=@MPI_COMPLEX@
-MPI_DOUBLE_COMPLEX=@MPI_DOUBLE_COMPLEX@
-MPI_LOGICAL=@MPI_LOGICAL@
-MPI_REAL=@MPI_REAL@
-MPI_DOUBLE_PRECISION=@MPI_DOUBLE_PRECISION@
-MPI_INTEGER=@MPI_INTEGER@
-MPI_2INTEGER=@MPI_2INTEGER@
-MPI_2COMPLEX=@MPI_2COMPLEX@
-MPI_2DOUBLE_COMPLEX=@MPI_2DOUBLE_COMPLEX@
-MPI_2REAL=@MPI_2REAL@
-MPI_2DOUBLE_PRECISION=@MPI_2DOUBLE_PRECISION@
-MPI_CHARACTER=@MPI_CHARACTER@
-# C type corresponding to a Fortran INTEGER
-MPI_FINT=@MPI_FINT@
-#
-# Name mangling
-F77_NAME_MANGLE=@F77_NAME_MANGLE@

src/env/mpif90.conf.in

-#! /bin/sh
-#
-# This file contains configuration information for mpicc.  This is
-# essentially just the variable-initialization part of mpif90.
-# --------------------------------------------------------------------------
-# Set the default values of all variables.
-#
-# Directory locations: Fixed for any MPI implementation.
-# Set from the directory arguments to configure (e.g., --prefix=/usr/local)
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-sysconfdir=@sysconfdir@
-includedir=@includedir@
-libdir=@libdir@
-
-# Default settings for compiler, flags, and libraries
-# Determined by a combination of environment variables and tests within
-# configure (e.g., determining whehter -lsocket is needee)
-FC="@FC@"
-FCCPP="@FCCPP@"
-# Fortran 90 Compiler characteristics
-FCINC="@FCINC@"
-# f90modinc specifies how to add a directory to the search path for modules.
-# Some compilers (Intel ifc version 5) do not support this concept, and 
-# instead need 
-# a specific list of files that contain module names and directories.
-# The FCMODINCSPEC is a more general approach that uses <dir> and <file>
-# for the directory and file respectively.
-FCMODINC="@FCMODINCFLAG@"
-FCMODINCSPEC="@FCMODINCSPEC@"
-FCEXT="@FCEXT@"
-FCFLAGS="@WRAPPER_FCFLAGS@"
-LDFLAGS="@WRAPPER_LDFLAGS@"
-LIBS="@WRAPPER_LIBS@"
-MPICH_VERSION="@MPICH_VERSION@"