--- mpich-1.2.7.orig/debian/clog2alog.1
+++ mpich-1.2.7/debian/clog2alog.1
@@ -0,0 +1,16 @@
+.TH clog2alog 1 "27 Feb 2001" "Debian GNU/Linux" "MPE/MPICH"
+.SH NAME
+clog2alog \- converts clog format logs to alog
+.SH SYNOPSIS
+.B clog2alog [
+.I execfilename
+.B ]
+
+.SH DESCRIPTION
+.B clog2alog 
+generates alog file from clog file. alog files can be processed by upshot.
+.SH AUTHOR
+This manpage has been written by Junichi Uekawa <dancer@debian.org> for Debian GNU/Linux
+.SH "SEE ALSO"
+clog2slog(1), "MPICH user's guide".
+
--- mpich-1.2.7.orig/debian/compat
+++ mpich-1.2.7/debian/compat
@@ -0,0 +1 @@
+7
--- mpich-1.2.7.orig/debian/mpich-bin.updatelist.in
+++ mpich-1.2.7/debian/mpich-bin.updatelist.in
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e 
+
+cat $CLUSTERXML | \
+update-cluster-remove --master | \
+update-cluster-parseconfig hostname > /etc/#MPICHDIR#/machines.LINUX || \
+exit 1
+ 
--- mpich-1.2.7.orig/debian/mpi-doc.dirs
+++ mpich-1.2.7/debian/mpi-doc.dirs
@@ -0,0 +1,2 @@
+usr/share/doc/mpi-doc
+usr/share/man
--- mpich-1.2.7.orig/debian/libmpich1.0-dev.prerm.in
+++ mpich-1.2.7/debian/libmpich1.0-dev.prerm.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ $1 != "upgrade" ] ; then 
+  update-alternatives --remove mpi /usr/lib/#MPICH#/include
+fi;
+
+#DEBHELPER#
+
--- mpich-1.2.7.orig/debian/libmpich1.0-dev.links.in
+++ mpich-1.2.7/debian/libmpich1.0-dev.links.in
@@ -0,0 +1,12 @@
+usr/lib/#MPICH#/bin/mpicc usr/bin/mpicc.#MPICH#
+usr/lib/#MPICH#/bin/mpicxx usr/bin/mpiCC.#MPICH#
+usr/lib/#MPICH#/bin/mpicxx usr/bin/mpicxx.#MPICH#
+usr/lib/#MPICH#/bin/mpif77 usr/bin/mpif77.#MPICH#
+usr/lib/#MPICH#/bin/mpif90 usr/bin/mpif90.#MPICH#
+usr/lib/#MPICH#/bin/mpireconfig usr/bin/mpireconfig.#MPICH#
+usr/lib/#MPICH#/man/man1/mpicc.1.gz usr/share/man/man1/mpicc.#MPICH#.1.gz
+usr/lib/#MPICH#/man/man1/mpiCC.1.gz usr/share/man/man1/mpiCC.#MPICH#.1.gz
+usr/lib/#MPICH#/man/man1/mpiCC.1.gz usr/share/man/man1/mpicxx.#MPICH#.1.gz
+usr/lib/#MPICH#/man/man1/mpif77.1.gz usr/share/man/man1/mpif77.#MPICH#.1.gz
+usr/lib/#MPICH#/man/man1/mpif90.1.gz usr/share/man/man1/mpif90.#MPICH#.1.gz
+usr/lib/#MPICH#/man/man1/mpireconfig.1.gz usr/share/man/man1/mpireconfig.#MPICH#.1.gz
--- mpich-1.2.7.orig/debian/docs
+++ mpich-1.2.7/debian/docs
@@ -0,0 +1 @@
+README 
--- mpich-1.2.7.orig/debian/mpi-doc.prerm
+++ mpich-1.2.7/debian/mpi-doc.prerm
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ $1 != "upgrade" ] ; then 
+  update-alternatives --remove MPI_Comm_set_name.3.gz /usr/share/man/man3/MPI_Comm_set_name_mpi-doc.3.gz
+fi;
+
+#DEBHELPER#
+
--- mpich-1.2.7.orig/debian/libmpich1.0-dev.postinst.in
+++ mpich-1.2.7/debian/libmpich1.0-dev.postinst.in
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+
+set -e
+
+case "$1" in
+   configure)
+      # Continue below
+      ;;
+   abort-upgrade|abort-remove|abort-deconfigure)
+      exit 0;
+      ;;
+   *)
+      echo "postinst called with unknown argument \`$1'" >&2
+      exit 0;
+      ;;
+esac
+
+update-alternatives \
+    --install /usr/include/mpi mpi /usr/lib/#MPICH#/include 10 \
+    --slave /usr/lib/libmpi.a libmpi.a /usr/lib/#MPICH#/lib/lib#MPICH#.a \
+    --slave /usr/lib/libmpi.so libmpi.so /usr/lib/#MPICH#/lib/shared/lib#MPICH#.so \
+    --slave /usr/lib/libmpi++.a libmpi++.a /usr/lib/#MPICH#/lib/libp#MPICH#++.a \
+    --slave /usr/lib/libmpi++.so libmpi++.so /usr/lib/#MPICH#/lib/shared/libp#MPICH#++.so \
+    --slave /usr/bin/mpicc mpicc /usr/bin/mpicc.#MPICH# \
+    --slave /usr/bin/mpiCC mpiCC /usr/bin/mpiCC.#MPICH# \
+    --slave /usr/bin/mpicxx mpicxx /usr/bin/mpicxx.#MPICH# \
+    --slave /usr/bin/mpif77 mpif77 /usr/bin/mpif77.#MPICH# \
+    --slave /usr/bin/mpif90 mpif90 /usr/bin/mpif90.#MPICH# \
+    --slave /usr/bin/mpireconfig mpireconfig /usr/bin/mpireconfig.#MPICH# \
+    --slave /usr/share/man/man1/mpicc.1.gz mpicc.1.gz /usr/share/man/man1/mpicc.#MPICH#.1.gz \
+    --slave /usr/share/man/man1/mpiCC.1.gz mpiCC.1.gz /usr/share/man/man1/mpiCC.#MPICH#.1.gz \
+    --slave /usr/share/man/man1/mpicxx.1.gz mpicxx.1.gz /usr/share/man/man1/mpicxx.#MPICH#.1.gz \
+    --slave /usr/share/man/man1/mpif77.1.gz mpif77.1.gz /usr/share/man/man1/mpif77.#MPICH#.1.gz \
+    --slave /usr/share/man/man1/mpif90.1.gz mpif90.1.gz /usr/share/man/man1/mpif90.#MPICH#.1.gz \
+    --slave /usr/share/man/man1/mpireconfig.1.gz mpireconfig.1.gz /usr/share/man/man1/mpireconfig.#MPICH#.1.gz
+
+#DEBHELPER#
--- mpich-1.2.7.orig/debian/control
+++ mpich-1.2.7/debian/control
@@ -0,0 +1,153 @@
+Source: mpich
+Homepage: http://www-unix.mcs.anl.gov/mpi/mpich1/
+Section: devel
+Priority: extra
+Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel@lists.alioth.debian.org>
+Uploaders: Adam C. Powell IV <hazelsct@debian.org>, Alexandre Fayolle <afayolle@debian.org>
+Standards-Version: 3.8.0
+Build-Depends: gfortran, rsh-client, libx11-dev, libxt-dev, file, debhelper (>> 7.0.0), dpatch, tk8.4, autotools-dev
+Build-Depends-Indep: bzip2
+
+
+Package: mpich-bin
+Architecture: any
+Depends: ${shlibs:Depends}, rsh-client, libmpich1.0gf (= ${binary:Version})
+Suggests: mpi-doc, libmpich1.0-dev (= ${binary:Version}), update-cluster, wish, rsh-server
+Conflicts: lam (<= 6.1), mpich (<< 1.2.5.3-2), mpich-common
+Replaces: mpich-common
+Description: MPI parallel computing system implementation
+ MPICH is a robust and flexible implementation of the MPI (Message Passing
+ Interface).  MPI is often used with parallel or distributed computing
+ projects.  MPICH is a multi-platform, configurable system (development,
+ execution, libraries, etc) for MPI.  It can achieve parallelism using
+ networked machines or using multitasking on a single machine. 
+ .
+ This version is compiled with ch_p4 support, which only requires installation
+ on the master node, and starts up parallel tasks using rsh.
+
+Package: mpich-mpd-bin
+Architecture: any
+Depends: ${shlibs:Depends}, rsh-client, gdb, libmpich-mpd1.0gf (= ${binary:Version})
+Suggests: mpi-doc, libmpich-mpd1.0-dev (= ${binary:Version}), update-cluster, wish, rsh-server
+Conflicts: lam (<=6.1), mpich-mpd (<< 1.2.5.3-2), mpich-common
+Replaces: libmpich-p4mpd1.0 (<= 1.2.4-8), mpich-common
+Description: MPI parallel computing system implementation, MPD version
+ MPICH is a robust and flexible implementation of the MPI (Message Passing
+ Interface).  MPI is often used with parallel or distributed computing
+ projects.  MPICH is a multi-platform, configurable system (development,
+ execution, libraries, etc) for MPI.  It can achieve parallelism using
+ networked machines or using multitasking on a single machine. 
+ .
+ This version is compiled with ch_p4mpd support, which requires mpd daemons
+ running on each of the cluster nodes.  This method is faster than ch_p4.
+
+Package: mpich-shmem-bin
+Architecture: any
+Depends: ${shlibs:Depends}, gdb, libmpich-shmem1.0gf (= ${binary:Version})
+Suggests: mpi-doc, libmpich-shmem1.0-dev (= ${binary:Version})
+Conflicts: lam (<=6.1), mpich-common
+Replaces: mpich-common
+Description: MPI parallel computing system implementation, SHMEM version
+ MPICH is a robust and flexible implementation of the MPI (Message Passing
+ Interface).  MPI is often used with parallel or distributed computing
+ projects.  MPICH is a multi-platform, configurable system (development,
+ execution, libraries, etc) for MPI.  It can achieve parallelism using
+ networked machines or using multitasking on a single machine. 
+ .
+ This version is compiled with ch_shmem support, which runs in shared memory.
+ This method is faster than ch_p4 or ch_p4mpd on SMP machines, but cannot be
+ used on a cluster.
+
+Package: libmpich1.0-dev
+Architecture: any
+Section: libdevel
+Depends: libmpich1.0gf
+Suggests: mpi-doc
+Provides: libmpich-dev
+Conflicts: lam (<= 6.1), mpich (<< 1.2.5.3-2), mpich-common, mpich-bin (<= 1.2.7-5)
+Replaces: mpich-common
+Description: mpich static libraries and development files
+ This package contains the header files, static libraries, symbolic links and
+ compiler wrappers (mpicc etc.) used to compile programs using che ch_p4
+ version of mpich.
+
+Package: libmpich-mpd1.0-dev
+Architecture: any
+Section: libdevel
+Depends: libmpich-mpd1.0gf
+Suggests: mpi-doc
+Provides: libmpich-dev
+Conflicts: lam (<=6.1), mpich-mpd (<< 1.2.5.3-2), mpich-common
+Replaces: libmpich-p4mpd1.0 (<= 1.2.4-8), mpich-common
+Description: mpich static libraries and development files
+ This package contains the header files, static libraries, symbolic links and
+ compiler wrappers (mpicc etc.) used to compile programs using the ch_p4mpd
+ version of mpich.
+
+Package: libmpich-shmem1.0-dev
+Architecture: any
+Section: libdevel
+Depends: libmpich-shmem1.0gf
+Suggests: mpi-doc
+Provides: libmpich-dev
+Conflicts: lam (<=6.1), mpich-shmem (<< 1.2.5.3-2), mpich-common
+Replaces: libmpich-p4shmem1.0 (<= 1.2.4-8), mpich-common
+Description: mpich static libraries and development files
+ This package contains the header files, static libraries, symbolic links and
+ compiler wrappers (mpicc etc.) used to compile programs using the ch_p4shmem
+ version of mpich.
+
+Package: libmpich1.0gf
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libmpich1.0, libmpich1.0c2, libmpich1.0-noslog, libmpich1.0ldbl
+Replaces: libmpich1.0, libmpich1.0c2, libmpich1.0-noslog, libmpich1.0ldbl
+Suggests: mpich-bin (= ${binary:Version})
+Description: mpich runtime shared library
+ This package includes the shared library files used for mpich runtime.
+
+Package: libmpich-mpd1.0gf
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libmpich-p4mpd1.0, libmpich-mpd1.0, libmpich-mpd1.0c2, libmpich-mpd1.0-noslog, libmpich-mpd1.0ldbl
+Replaces: libmpich-p4mpd1.0, libmpich-mpd1.0, libmpich-mpd1.0c2, libmpich-mpd1.0-noslog, libmpich-mpd1.0ldbl
+Recommends: mpich-mpd-bin (= ${binary:Version})
+Description: mpich-mpd runtime shared library
+ This package includes the shared library files used for mpich-mpd runtime.
+
+Package: libmpich-shmem1.0gf
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libmpich-shmem1.0, libmpich-shmem1.0c2, libmpich-shmem1.0-noslog, libmpich-shmem1.0ldbl
+Replaces: libmpich-shmem1.0, libmpich-shmem1.0c2, libmpich-shmem1.0-noslog, libmpich-shmem1.0ldbl
+Recommends: mpich-shmem-bin (= ${binary:Version})
+Description: mpich-shmem runtime shared library
+ This package includes the shared library files used for mpich-shmem runtime.
+
+Package: mpi-doc
+Architecture: all
+Section: doc
+Priority: optional
+Suggests: www-browser
+Conflicts: mpich (<<1.1.2), mpich-common, lam4-dev
+Description: Documentation for the MPICH MPI implementation and user's guides
+ This package provides manual pages in both man and HTML form
+ documenting the MPI (Message Passing Interface) parallel programming
+ standard as implemented by MPICH, and the user's guides for the transports
+ included in binary Debian packages (chp4, chp4mpd, chshmem).
+ .
+ For the MPI specification, see mpi-specs.
+
+Package: mpe-source
+Architecture: all
+Section: devel
+Priority: extra
+Description: Source for MPE, for other package to build-depend
+ This package includes the source to MPE, so that 
+ other package can build MPE Build-depending in this package.
+ .
+ MPE is a set of tools to profile MPI (Message Passing Interface) programs,
+ and other tools, useful in debugging MPI applications.
--- mpich-1.2.7.orig/debian/clog_print.1
+++ mpich-1.2.7/debian/clog_print.1
@@ -0,0 +1,16 @@
+.TH clog_print 1 "27 Feb 2001" "Debian GNU/Linux" "MPE/MPICH"
+.SH NAME
+clog_print \- prints out the contents of a clog file
+.SH SYNOPSIS
+.B clog_print [
+.I clogfilename 
+.B ]
+
+.SH DESCRIPTION
+.B clog_print 
+dumps the contents of a clog file out to stdout.
+.SH AUTHOR
+This manpage has been written by Junichi Uekawa <dancer@debian.org> for Debian GNU/Linux
+.SH "SEE ALSO"
+clog2slog(1), clog2alog(1), mpicc(1), mpiCC(1), mpif77(1), mpif90(1), mpirun(1), "MPICH user's guide".
+
--- mpich-1.2.7.orig/debian/mpich-bin.dirs.in
+++ mpich-1.2.7/debian/mpich-bin.dirs.in
@@ -0,0 +1,3 @@
+etc/#MPICH#
+usr/bin
+usr/share/doc/#MPICH#-bin
--- mpich-1.2.7.orig/debian/rules
+++ mpich-1.2.7/debian/rules
@@ -0,0 +1,293 @@
+#!/usr/bin/make -f
+# Made with the iad of dh_make, by Craig Small
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+# Also some stuff taken from debmake scripts, by Cristopt Lameter.
+# hacking on for MPICH done since 13 June 2000 by Junichi Uekawa
+# (dancer@netfort.gr.jp)
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# parameters accepted for DEB_BUILD_OPTIONS: 
+#  experimental-shlibs-support
+#  debug
+
+INSTALL_DIR=install -m 755 -d 
+INSTALL_FILE=install -m 644
+
+CONFIGURE_ENVIRONMENT= RSHCOMMAND=/usr/bin/rsh FC=gfortran F90=gfortran \
+	F77_GETARGDECL="intrinsic GETARG" NOG2C=1
+
+CONFIG_SG_DIRS= mpe mpe/slog2sdk mpe/slog2sdk/trace_rlog mpe/slog2sdk/trace_sample \
+		examples/perftest/config/confdb src/fortran/config MPI-2-C++ romio/confdb
+
+# checks the environmental variable DEB_BUILD_OPTIONS
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+CONFIGURE_OPTIONS+= --enable-devdebug --enable-debug 
+#--enable-mpedbg  # this kills the build machine very badly with ed.
+else
+CONFIGURE_OPTIONS+= --disable-devdebug --disable-debug --disable-mpedbg
+endif
+
+CONFIGURE_OPTIONS_P4=--with-device=ch_p4 \
+	-prefix=/usr/lib/mpich --enable-sharedlib=/usr/lib/mpich/lib/shared/ \
+	-mpe_opts="--with-mpelibname=mpe"
+CONFIGURE_OPTIONS_MPD=--with-device=ch_p4mpd \
+	-prefix=/usr/lib/mpich-mpd -mpilibname=mpich-p4mpd \
+	--enable-sharedlib=/usr/lib/mpich-mpd/lib/shared/ \
+	-mpe_opts="--with-mpelibname=mpe-p4mpd"
+CONFIGURE_OPTIONS_SHMEM=--with-device=ch_shmem \
+	-prefix=/usr/lib/mpich-shmem -mpilibname=mpich-shmem \
+	--enable-sharedlib=/usr/lib/mpich-shmem/lib/shared/ \
+	-mpe_opts="--with-mpelibname=mpe-shmem"
+
+include /usr/share/dpatch/dpatch.make
+
+build: build-stamp
+build-stamp: patch-stamp
+	dh_testdir
+	for CFGAUXDIR in $(CONFIG_SG_DIRS) ; do \
+	    cp -f /usr/share/misc/config.sub $$CFGAUXDIR ; \
+	    cp -f /usr/share/misc/config.guess $$CFGAUXDIR ; \
+	done
+	# make mpich normal
+	(test -d image_mpich || mkdir image_mpich; cd image_mpich && \
+	$(CONFIGURE_ENVIRONMENT) ../configure $(CONFIGURE_OPTIONS_P4) && \
+	F77_GETARGDECL="intrinsic GETARG" $(MAKE) )
+	# make mpich MPD version
+	(test -d image_mpich-mpd || mkdir image_mpich-mpd; \
+	cd image_mpich-mpd && \
+	$(CONFIGURE_ENVIRONMENT) ../configure $(CONFIGURE_OPTIONS_MPD) && \
+	F77_GETARGDECL="intrinsic GETARG" $(MAKE) )
+	# make mpich SHMEM version
+	(test -d image_mpich-shmem || mkdir image_mpich-shmem; \
+	cd image_mpich-shmem && \
+	$(CONFIGURE_ENVIRONMENT) ../configure $(CONFIGURE_OPTIONS_SHMEM) && \
+	F77_GETARGDECL="intrinsic GETARG" $(MAKE) )
+	# make some debhelper files.
+	(set -e; for INST in mpich mpich-mpd mpich-shmem ; do \
+	  for FILES in dirs preinst postinst prerm links; do \
+	    sed 's/#MPICH#/'$$INST'/g' < debian/mpich-bin.$$FILES.in >debian/$$INST-bin.$$FILES;\
+	    done;\
+	  for FILES in postinst prerm links; do \
+	    sed 's/#MPICH#/'$$INST'/g' < debian/libmpich1.0-dev.$$FILES.in >debian/lib"$$INST"1.0-dev.$$FILES;\
+	    done;\
+	  done;\
+	 sed -i 's/\(.*lib.*\)mpich-mpd\([^/]\)/\1mpich-p4mpd\2/' debian/libmpich-mpd1.0-dev.postinst;\
+	)
+	echo usr/lib/mpich-mpd/bin/mpichboot usr/bin/mpichboot >> debian/mpich-mpd-bin.links
+	echo usr/lib/mpich-mpd/bin/mpichstop usr/bin/mpichstop >> debian/mpich-mpd-bin.links
+	echo usr/share/man/man7/undocumented.7.gz usr/share/man/man1/mpichboot.1.gz >> debian/mpich-mpd-bin.links
+	echo usr/share/man/man7/undocumented.7.gz usr/share/man/man1/mpichstop.1.gz >> debian/mpich-mpd-bin.links
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	for CFGAUXDIR in $(CONFIG_SG_DIRS) ; do \
+	    rm -f $$CFGAUXDIR/config.sub ; \
+	    rm -f $$CFGAUXDIR/config.guess ; \
+	done
+	rm -f build-stamp install-stamp
+	# clean up the build directory
+	(set -e; for INST in mpich mpich-mpd mpich-shmem ; do \
+	  for FILES in dirs preinst postinst prerm links doc-base; do \
+	    rm -f debian/$$INST-bin.$$FILES;\
+	  done;\
+	done;\
+	)
+	for INST in mpich mpich-mpd mpich-shmem; do \
+	  for FILES in postinst prerm links; do \
+	    rm -f debian/lib$${INST}1.0-dev.$$FILES; \
+	  done; \
+	done
+	rm -rf image_mpich image_mpich-mpd image_mpich-shmem
+	# cleaning cruft created by MPD.
+	rm -f mpid/ch_p4mpd/p4mpd/lib/p4_MD.c mpid/ch_p4mpd/p4mpd/lib/p4_MD.h mpid/ch_p4mpd/p4mpd/lib/p4_alloc.c mpid/ch_p4mpd/p4mpd/lib/p4_args.c mpid/ch_p4mpd/p4mpd/lib/p4_broadcast.c mpid/ch_p4mpd/p4mpd/lib/p4_debug.c mpid/ch_p4mpd/p4mpd/lib/p4_defs.h mpid/ch_p4mpd/p4mpd/lib/p4_funcs.h mpid/ch_p4mpd/p4mpd/lib/p4_error.c mpid/ch_p4mpd/p4mpd/lib/p4_rm.c mpid/ch_p4mpd/p4mpd/lib/p4_secure.c mpid/ch_p4mpd/p4mpd/lib/p4_sock_conn.c mpid/ch_p4mpd/p4mpd/lib/p4_sock_cr.c mpid/ch_p4mpd/p4mpd/lib/p4_sock_sr.c mpid/ch_p4mpd/p4mpd/lib/p4_sock_util.c mpid/ch_p4mpd/p4mpd/lib/p4_sock_util.h mpid/ch_p4mpd/p4mpd/lib/p4_sys.h mpid/ch_p4mpd/p4mpd/lib/p4_sys_funcs.h mpid/ch_p4mpd/p4mpd/lib/xdr_float.c mpid/ch_p4mpd/p4mpd/lib/listener_p4.c mpid/ch_p4mpd/p4mpd/lib/p4.h mpid/ch_p4mpd/p4mpd/lib/p4_fc.c mpid/ch_p4mpd/p4mpd/lib/p4_globals.c mpid/ch_p4mpd/p4mpd/lib/p4_globals.h mpid/ch_p4mpd/p4mpd/lib/p4_macros.h mpid/ch_p4mpd/p4mpd/lib/p4_mon.c mpid/ch_p4mpd/p4mpd/lib/p4_mon.h mpid/ch_p4mpd/p4mpd/lib/p4_patchlevel.h mpid/ch_p4mpd/p4mpd/lib/p4_procgroup.c mpid/ch_p4mpd/p4mpd/lib/p4_shmem_sr.c mpid/ch_p4mpd/p4mpd/lib/p4_sr.h mpid/ch_p4mpd/p4mpd/lib/sfcdchi.h mpid/ch_p4mpd/p4mpd/lib/makefile.proto mpid/ch_p4mpd/p4mpd/monitors mpid/ch_p4mpd/p4mpd/CHANGES mpid/ch_p4mpd/p4mpd/MACHINES mpid/ch_p4mpd/p4mpd/OPTIONS mpid/ch_p4mpd/p4mpd/README mpid/ch_p4mpd/p4mpd/config.guess mpid/ch_p4mpd/p4mpd/defs.all mpid/ch_p4mpd/p4mpd/p4_config.h.in mpid/ch_p4mpd/p4mpd/configure mpid/ch_p4mpd/p4mpd/configure.in  mpid/ch_p4mpd/p4mpd/alog mpid/ch_p4mpd/p4mpd/bin mpid/ch_p4mpd/p4mpd/servers  mpid/ch_p4mpd/p4mpd/usc mpid/ch_p4mpd/p4mpd/doc mpid/ch_p4mpd/p4mpd/messages mpid/ch_p4mpd/p4mpd/contrib mpid/ch_p4mpd/p4mpd/contrib_f mpid/ch_p4mpd/p4mpd/messages_f mpid/ch_p4mpd/p4mpd/misc
+	# cleaning mpe things
+	rm -f mpe/tmp/config.log
+	dh_clean
+
+install: install-stamp 
+install-stamp: build-stamp
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+	# make them sh +ex for debugging.
+
+	# install the normal version.
+	(cd image_mpich && \
+	DESTDIR=$(CURDIR)/debian/mpich-bin/ /bin/sh -e bin/mpiinstall \
+	)
+	# install the ch_p4mpd version
+	(cd image_mpich-mpd && \
+	DESTDIR=$(CURDIR)/debian/mpich-mpd-bin/ /bin/sh -e bin/mpiinstall \
+	)
+	# install the ch_shmem version
+	(cd image_mpich-shmem && \
+	DESTDIR=$(CURDIR)/debian/mpich-shmem-bin/ /bin/sh -e bin/mpiinstall \
+	)
+
+	# NOW: We have all the dirs up, and working.
+
+	# this is bulky... and scary. Fixes script paths.
+	sh debian/fixup.sh
+
+	# Move docs into mpi-doc
+	cp -a debian/mpich-bin/usr/lib/mpich/doc/* \
+	  debian/mpich-bin/usr/lib/mpich/www \
+	  debian/mpi-doc/usr/share/doc/mpi-doc/
+	cp -a debian/mpich-bin/usr/lib/mpich/man/man3 \
+	  debian/mpich-bin/usr/lib/mpich/man/man4 \
+	  debian/mpi-doc/usr/share/man/
+	cp doc/mpichman-chp4.pdf doc/mpichman-chp4mpd.pdf \
+	  doc/mpichman-chshmem.pdf debian/mpi-doc/usr/share/doc/mpi-doc/
+	# Avoid conflict with lam4-dev MPI_Comm_set_name manpage (see postinst)
+	mv debian/mpi-doc/usr/share/man/man3/MPI_Comm_set_name.3 \
+	  debian/mpi-doc/usr/share/man/man3/MPI_Comm_set_name_mpi-doc.3
+
+	# fix things up for MPICH ... it installs files in a very ugly way
+	# -- make a config file DEBIAN WAY
+	# and other misc stuff is done here.
+	(set -e; for INST in mpich mpich-mpd mpich-shmem ; do \
+	  cp debian/machines.LINUX debian/$$INST-bin/etc/$$INST/machines.LINUX;\
+	  rm -f debian/$$INST-bin/usr/lib/$$INST/share/machines.LINUX;\
+	  rm -f debian/$$INST-bin/usr/lib/$$INST/share/Makefile.sample;\
+	  for A in mpiuninstall chkserv ; do rm -f debian/$$INST-bin/usr/lib/$$INST/sbin/$$A; done;\
+	  rm -rf debian/$$INST-bin/usr/lib/$$INST/doc;\
+	  rm -rf debian/$$INST-bin/usr/lib/$$INST/html;\
+	  rm -rf debian/$$INST-bin/usr/lib/$$INST/man/man3;\
+	  rm -rf debian/$$INST-bin/usr/lib/$$INST/man/man4;\
+	  rm -rf debian/$$INST-bin/usr/lib/$$INST/www;\
+	  rm -rf debian/$$INST-bin/usr/lib/$$INST/share/upshot/sbin;\
+	  cp man/mpiman.help debian/$$INST-bin/usr/lib/$$INST/man/;\
+	  for A in man3 man4; do ln -s ../../../share/man/$$A debian/$$INST-bin/usr/lib/$$INST/man/$$A; done;\
+	  $(INSTALL_DIR) debian/lib"$$INST"1.0-dev/usr/share/doc/lib"$$INST"1.0-dev;\
+	  mv debian/$$INST-bin/usr/lib/$$INST/share/examples debian/lib"$$INST"1.0-dev/usr/share/doc/lib"$$INST"1.0-dev;\
+	  mkdir debian/lib"$$INST"1.0-dev/usr/share/doc/lib"$$INST"1.0-dev/examples/pi;\
+	  mv debian/$$INST-bin/usr/lib/$$INST/examples/* debian/lib"$$INST"1.0-dev/usr/share/doc/lib"$$INST"1.0-dev/examples/pi;\
+	  rmdir debian/lib"$$INST"1.0-dev/usr/share/doc/lib"$$INST"1.0-dev/examples/pi/MPI-2-C++;\
+	  rmdir debian/$$INST-bin/usr/lib/$$INST/examples;\
+	  rm debian/lib"$$INST"1.0-dev/usr/share/doc/lib"$$INST"1.0-dev/examples/pi/mpirun ;\
+	  install -d debian/$$INST-bin/usr/lib/update-cluster;\
+	  sed 's/#MPICHDIR#/'$$INST'/g' < debian/mpich-bin.updatelist.in > image_$$INST/$$INST.updatelist;\
+	  install -m 755 image_$$INST/$$INST.updatelist debian/$$INST-bin/usr/lib/update-cluster;\
+	done;\
+	)
+	# install libs to proper places.
+	(set -e; for INST in mpich mpich-mpd mpich-shmem ; do \
+	  $(INSTALL_DIR) debian/lib"$$INST"1.0gf/usr/lib/$$INST/lib/shared; \
+	  $(INSTALL_DIR) debian/lib"$$INST"1.0-dev/usr/lib/$$INST/bin; \
+	  $(INSTALL_DIR) debian/lib"$$INST"1.0-dev/usr/lib/$$INST/etc; \
+	  $(INSTALL_DIR) debian/lib"$$INST"1.0-dev/usr/lib/$$INST/man/man1; \
+	  rm -f debian/$$INST-bin/usr/lib/$$INST/lib/lib*.so.1 \
+	    debian/$$INST-bin/usr/lib/$$INST/lib/lib*.so \
+	    debian/$$INST-bin/usr/lib/$$INST/lib/shared/lib*.so.1 \
+	    debian/$$INST-bin/usr/lib/$$INST/lib/shared/lib*.so; \
+	  mv debian/$$INST-bin/usr/lib/$$INST/include debian/lib"$$INST"1.0-dev/usr/lib/$$INST/; \
+	  mv debian/$$INST-bin/usr/lib/$$INST/lib debian/lib"$$INST"1.0-dev/usr/lib/$$INST/; \
+	  mv debian/lib"$$INST"1.0-dev/usr/lib/$$INST/lib/lib*.so.1.0 debian/lib"$$INST"1.0-dev/usr/lib/$$INST/lib/shared/; \
+	  mv debian/lib"$$INST"1.0-dev/usr/lib/$$INST/lib/shared/lib*.so.1.0 debian/lib"$$INST"1.0gf/usr/lib/$$INST/lib/shared/; \
+	  for LIB in `(cd debian/lib"$$INST"1.0gf/usr/lib/$$INST/lib/shared && ls lib*.so.*)`; do \
+	    ln -s $$INST/lib/shared/$$LIB debian/lib"$$INST"1.0gf/usr/lib/$$LIB; \
+	  done; \
+	done;\
+	)
+	# Properly install binaries, man pages and scripts
+	(set -e; for INST in mpich mpich-mpd mpich-shmem ; do \
+	  for BIN in mpicc mpicxx mpif77 mpif90 mpireconfig; do \
+	    mv debian/$$INST-bin/usr/lib/$$INST/bin/$$BIN debian/lib"$$INST"1.0-dev/usr/lib/$$INST/bin; \
+	  done; \
+	  for MAN in mpicc mpiCC mpif77 mpif90 mpireconfig; do \
+	    mv debian/$$INST-bin/usr/lib/$$INST/man/man1/$$MAN.1 debian/lib"$$INST"1.0-dev/usr/lib/$$INST/man/man1; \
+	  done; \
+	  for SCRIPT in mpichlib mpif77 mpif90; do \
+	    mv debian/$$INST-bin/usr/lib/$$INST/etc/$$SCRIPT.conf debian/lib"$$INST"1.0-dev/usr/lib/$$INST/etc; \
+	    chmod +x debian/lib"$$INST"1.0-dev/usr/lib/$$INST/etc/$$SCRIPT.conf; \
+	  done; \
+	  cp debian/*.1 debian/$$INST-bin/usr/lib/$$INST/man/man1/; \
+	  gzip debian/$$INST-bin/usr/lib/$$INST/man/man1/*.1; \
+	  gzip debian/lib"$$INST"1.0-dev/usr/lib/$$INST/man/man1/*.1; \
+	done;\
+	)
+	#
+	cp -r www/* debian/mpi-doc/usr/share/doc/mpi-doc/www/
+	cp doc/mpiman.ps debian/mpi-doc/usr/share/doc/mpi-doc
+	#cd man/man3/ && for A in *; do cat $$A | sed 's/^\(\.so .*3\)/\1mpich/' > ../../debian/mpi-doc/usr/share/man/man3/$${A}mpich; done
+	# fixing mpd binaries up.
+	for A in mpdallexit mpdbomb mpdclean mpdcleanup mpddump mpdexit mpdhelp \
+	mpdkilljob mpdlistjobs mpdmandump  mpdmpexec mpdringsize mpdringtest mpdshutdown mpdtrace  mpigdb  mpirun ; do \
+	ln -sf mpdcon ${CURDIR}/debian/mpich-mpd-bin/usr/lib/mpich-mpd/bin/$$A; done
+
+	# mpich removal and lib symlinks
+	rm -f debian/libmpich1.0-dev/usr/share/doc/libmpich1.0-dev/examples/mpirun
+	for LIB in libmpich libfmpich libpmpich libpmpich++ libtvmpich libmpe; do\
+	  ln -s $$LIB.so.1.0 debian/libmpich1.0-dev/usr/lib/mpich/lib/shared/$$LIB.so; \
+	done; \
+
+	# mpich-mpd lib symlinks
+	for LIB in libmpich libfmpich libpmpich libtvmpich libmpe; do \
+	  ln -s $$LIB-p4mpd.so.1.0 debian/libmpich-mpd1.0-dev/usr/lib/mpich-mpd/lib/shared/$$LIB-p4mpd.so; \
+	done
+	# libpmpich-p4mpd++.so.1.0 has a soname that does not suit the loop above
+	ln -s libpmpich-p4mpd++.so.1.0 debian/libmpich-mpd1.0-dev/usr/lib/mpich-mpd/lib/shared/libpmpich-p4mpd++.so
+	# hack mpe-mpd to have libmpe.so in their directory.
+	ln -s libmpe-p4mpd.so.1.0 debian/libmpich-mpd1.0-dev/usr/lib/mpich-mpd/lib/shared/libmpe.so
+	# -- end of custom installation
+
+	# mpich-shmem lib symlinks
+	for LIB in libmpich libfmpich libpmpich libpmpich++ libtvmpich libmpe; do \
+	  ln -s $$LIB-shmem.so.1.0 debian/libmpich-shmem1.0-dev/usr/lib/mpich-shmem/lib/shared/$$LIB-shmem.so; \
+	done
+	# libpmpich-shmem++.so.1.0 has a soname that does not suit the loop above
+	ln -s libpmpich-shmem++.so.1.0 debian/libmpich-shmem1.0-dev/usr/lib/mpich-shmem/lib/shared/libpmpich-shmem++.so
+	# hack mpe-shmem to have libmpe.so in their directory.
+	ln -s libmpe-shmem.so.1.0 debian/libmpich-shmem1.0-dev/usr/lib/mpich-shmem/lib/shared/libmpe.so
+	# -- end of custom installation
+	touch install-stamp
+
+# Build architecture-independent files here.
+binary-indep: build-stamp install-stamp
+	dh_testdir -i
+	dh_testroot -i
+	# create the source archive, and do something.
+	install -d debian/mpe-source/usr/share/mpe-source
+	tar cf - mpe | bzip2 > debian/mpe-source/usr/share/mpe-source/mpe.tar.bz2
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_installmenu -i
+	dh_installchangelogs -i 
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build-stamp install-stamp
+	dh_testdir -a
+	dh_testroot -a
+	dh_installdocs -a 
+	dh_installexamples -a
+	dh_installmenu -a
+	dh_link -a
+	dh_installcron -a
+	dh_installchangelogs -a 
+	dh_strip -a
+	dh_makeshlibs -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+source diff:
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
--- mpich-1.2.7.orig/debian/mpi-doc.postinst
+++ mpich-1.2.7/debian/mpi-doc.postinst
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+   configure)
+      # Continue below
+      ;;
+   abort-upgrade|abort-remove|abort-deconfigure)
+      exit 0;
+      ;;
+   *)
+      echo "postinst called with unknown argument \`$1'" >&2
+      exit 0;
+      ;;
+esac
+
+update-alternatives \
+    --install /usr/share/man/man3/MPI_Comm_set_name.3.gz MPI_Comm_set_name.3.gz /usr/share/man/man3/MPI_Comm_set_name_mpi-doc.3.gz 10
+#DEBHELPER#
--- mpich-1.2.7.orig/debian/mpich-bin.prerm.in
+++ mpich-1.2.7/debian/mpich-bin.prerm.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ $1 != "upgrade" ] ; then 
+  update-alternatives --remove mpirun /usr/bin/mpirun.#MPICH#
+fi;
+
+#DEBHELPER#
+
--- mpich-1.2.7.orig/debian/copyright
+++ mpich-1.2.7/debian/copyright
@@ -0,0 +1,204 @@
+This package was intially debianized by John Goerzen jgoerzen@complete.org on
+Fri,  6 Feb 1998 19:50:40 -0600.  It has since been repackaged by Mark Brown
+<broonie@debian.org>.
+Then it was taken up by Junichi Uekawa dancer@netfort.gr.jp on
+Tue, 13 Jun 2000 16:21:06 +0900.
+
+It was downloaded from http://www.mcs.anl.gov/mpi/mpich/
+	ftp://ftp.mcs.anl.gov/pub/mpi
+
+The upstream contact address is mpi-bugs@mcs.anl.gov.
+
+
+Copyright:
+
+The main MPICH package is distributed via a following license:
+---------------------------------------------------------------
+
+				  COPYRIGHT
+
+The following is a notice of limited availability of the code, and disclaimer
+which must be included in the prologue of the code and in all source listings
+of the code.
+
+Copyright Notice
+ + 1993 University of Chicago
+ + 1993 Mississippi State University
+
+Permission is hereby granted to use, reproduce, prepare derivative works, and
+to redistribute to others.  This software was authored by:
+
+Argonne National Laboratory Group
+W. Gropp: (630) 252-4318; FAX: (708) 252-7852; e-mail: gropp@mcs.anl.gov
+E. Lusk: (630) 252-7852; FAX: (708) 252-7852; e-mail: lusk@mcs.anl.gov
+Mathematics and Computer Science Division
+Argonne National Laboratory, Argonne IL 60439
+
+Mississippi State Group
+N. Doss:  (601) 325-2565; FAX: (601) 325-7692; e-mail: doss@erc.msstate.edu
+A. Skjellum:(601) 325-8435; FAX: (601) 325-8997; e-mail: tony@erc.msstate.edu
+Mississippi State University, Computer Science Department &
+ NSF Engineering Research Center for Computational Field Simulation
+P.O. Box 6176, Mississippi State MS 39762
+
+			      GOVERNMENT LICENSE
+
+Portions of this material resulted from work developed under a U.S.
+Government Contract and are subject to the following license: the Government
+is granted for itself and others acting on its behalf a paid-up, nonexclusive,
+irrevocable worldwide license in this computer software to reproduce, prepare
+derivative works, and perform publicly and display publicly.
+
+				  DISCLAIMER
+
+This computer code material was prepared, in part, as an account of work
+sponsored by an agency of the United States Government.  Neither the United
+States, nor the University of Chicago, nor Mississippi State University, nor
+any of their employees, makes any warranty express or implied, or assumes any
+legal liability or responsibility for the accuracy, completeness, or
+usefulness of any information, apparatus, product, or process disclosed, or
+represents that its use would not infringe privately owned rights.
+---------------------------------------------------------------
+
+MPI-2-C++ come with the following license
+---------------------------------------------------------------
+COPYRIGHT NOTICE:
+
+Copyright 1997, University of Notre Dame.
+Authors: Andrew Lumsdaine, Michael P. McNally, Jeremy G. Siek,
+         Jeffery M. Squyres.
+
+LICENSE AGREEMENT:
+
+In consideration of being allowed to copy and/or use this software,
+user agrees to be bound by the terms and conditions of this License
+Agreement as "Licensee."  This Agreement gives you, the LICENSEE,
+certain rights and obligations.  By using the software, you indicate
+that you have read, understood, and will comply with the following
+terms and conditions.
+
+Permission is hereby granted to use or copy this program for any
+purpose, provided the text of this NOTICE (to include COPYRIGHT
+NOTICE, LICENSE AGREEMENT, and DISCLAIMER) is retained with all
+copies.  Permission to modify the code and to distribute modified code
+is granted, provided the text of this NOTICE is retained, a notice
+that the code was modified is included with the above COPYRIGHT NOTICE
+and with the COPYRIGHT NOTICE in any modified files, and that this
+file ("LICENSE") is distributed with the modified code.
+
+Title to copyright to this software and its derivatives and to any
+associated documentation shall at all times remain with Licensor and
+LICENSEE agrees to preserve the same.  Nothing in this Agreement shall
+be construed as conferring rights to use in advertising, publicity or
+otherwise any trademark or the name of the University of Notre Dame du
+Lac.
+
+DISCLAIMER:
+
+LICENSOR MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.
+By way of example, but not limitation, Licensor MAKES NO
+REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE COMPONENTS
+OR DOCUMENTATION WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS
+OR OTHER RIGHTS.
+
+The Authors and the University of Notre Dame du Lac shall not be held
+liable for any liability nor for any direct, indirect or consequential
+damages with respect to any claim by LICENSEE or any third party on
+account of or arising from this Agreement or use of this software.
+
+Any disputes arising out of this Agreement or LICENSEE'S use of the
+software at any time shall be resolved by the courts of the state of
+Indiana.  LICENSEE hereby consents to the jurisdiction of the Indiana
+courts and waives the right to challenge the jurisdiction thereof in
+any dispute arising out of this Agreement or Licensee's use of the
+software.
+---------------------------------------------------------------
+
+Jumpshot comes with the following license
+---------------------------------------------------------------
+				  COPYRIGHT
+
+  The following is a notice of limited availability of the code, and disclaimer
+  which must be included in the prologue of the code and in all source listings
+  of the code.
+
+  Copyright Notice
+   + 1998 The University of Chicago
+
+  Permission is hereby granted to use, reproduce, prepare derivative works, and
+  to redistribute to others.  This software was authored by:
+
+  O. Zaki:  (630) 252-7852; FAX: (630) 252-5986; e-mail: zaki@mcs.anl.gov
+  E. Lusk: (630) 252-7852; FAX: (630) 252-5986; e-mail: lusk@mcs.anl.gov
+  W. Gropp: (630) 252-4318; FAX: (630) 252-5986; e-mail: gropp@mcs.anl.gov
+  D. Swider: (630) 252-5941; FAX: (630) 252-5986; e-mail: swider@mcs.anl.gov
+  Mathematics and Computer Science Division
+  Argonne National Laboratory, Argonne IL 60439
+
+
+				GOVERNMENT LICENSE
+
+  Portions of this material resulted from work developed under a U.S.
+  Government Contract and are subject to the following license: the Government
+  is granted for itself and others acting on its behalf a paid-up, nonexclusive,
+  irrevocable worldwide license in this computer software to reproduce, prepare
+  derivative works, and perform publicly and display publicly.
+
+				    DISCLAIMER
+
+  This computer code material was prepared, in part, as an account of work
+  sponsored by an agency of the United States Government.  Neither the United
+  States, nor the University of Chicago, nor Mississippi State University, nor
+  any of their employees, makes any warranty express or implied, or assumes any
+  legal liability or responsibility for the accuracy, completeness, or
+  usefulness of any information, apparatus, product, or process disclosed, or
+  represents that its use would not infringe privately owned rights.
+---------------------------------------------------------------
+
+romio comes with the following license.
+---------------------------------------------------------------
+                               COPYRIGHT
+
+The following is a notice of limited availability of the code and
+disclaimer, which must be included in the prologue of the code and in
+all source listings of the code.
+
+Copyright (C) 1997 University of Chicago
+
+Permission is hereby granted to use, reproduce, prepare derivative
+works, and to redistribute to others. 
+
+The University of Chicago makes no representations as to the suitability, 
+operability, accuracy, or correctness of this software for any purpose. 
+It is provided "as is" without express or implied warranty. 
+
+This software was authored by:
+Rajeev Thakur: (630) 252-1682; thakur@mcs.anl.gov
+Mathematics and Computer Science Division
+Argonne National Laboratory, Argonne IL 60439, USA
+
+
+                           GOVERNMENT LICENSE
+
+Portions of this material resulted from work developed under a U.S.
+Government Contract and are subject to the following license: the
+Government is granted for itself and others acting on its behalf a
+paid-up, nonexclusive, irrevocable worldwide license in this computer
+software to reproduce, prepare derivative works, and perform publicly
+and display publicly. 
+
+                              DISCLAIMER
+
+This computer code material was prepared, in part, as an account of
+work sponsored by an agency of the United States Government.  Neither
+the United States Government, nor the University of Chicago, nor any
+of their employees, makes any warranty express or implied, or assumes
+any legal liability or responsibility for the accuracy, completeness,
+or usefulness of any information, apparatus, product, or process
+disclosed, or represents that its use would not infringe privately
+owned rights.  
+---------------------------------------------------------------
+
+All modifications made for Debian may be used, modifed and distributed
+freely.
--- mpich-1.2.7.orig/debian/mpich-bin.preinst.in
+++ mpich-1.2.7/debian/mpich-bin.preinst.in
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+   upgrade)
+
+     # If /usr/lib/mpich/man/* are symlinks, delete them so that dpkg will
+     # create the directories correctly.  Do this on any upgrade since we 
+     # may have done a borken upgrade in the past.
+     for x in /usr/lib/#MPICH#/man/* ; do
+        if [ -L $x ] ; then
+           rm $x
+        fi
+     done
+     ;;
+
+   install)
+     ;;
+   abort-upgrade)
+     ;;
+
+   *)
+     echo "preinst called with unknown argument \'$1\'" >&2
+     exit 0
+     ;;
+esac
+
+#DEBHELPER#
--- mpich-1.2.7.orig/debian/mpi-doc.doc-base
+++ mpich-1.2.7/debian/mpi-doc.doc-base
@@ -0,0 +1,14 @@
+Document: mpi-doc
+Title: MPI Model implementation "MPICH" reference manual
+Author: William Gropp, Nathan Doss, Anthony Skjellum 
+Abstract: Reference manual on the programming interface of MPICH
+ (the Message Passing Interface for cluster computer programming)
+ with all the available functions documented.
+Section: Programming
+
+Format: postscript
+Files: /usr/share/doc/mpi-doc/mpiman.ps.gz
+
+Format: HTML
+Index: /usr/share/doc/mpi-doc/www/index.html
+Files: /usr/share/doc/mpi-doc/www/www?/*.html
--- mpich-1.2.7.orig/debian/TODO
+++ mpich-1.2.7/debian/TODO
@@ -0,0 +1,20 @@
+Things to do or some of the wishlists: 
+
+  -- short-term TODO
+
+ * Make mpich-mpd work with mpe-mpd, wrt mpicc. mpicc for mpd is
+   broken.
+ * keep on updating the TODO file.
+
+  -- long-term TODO
+
+ * make mpiman work -- isn't the Debian man program broken ?
+ * fix the bug about links being external
+ * The debugger for mpich doesn't seem to be working at all..
+ * build nupshot... It is in mpe/profiling/nupshot, and needs to be built with
+   ./configure; make there... : And it is so outdated and everything, I cannot 
+   possibly build it. Life is tough.
+ * Jumpshot ? How do I build this beast, is beyond me.
+
+ -- Junichi Uekawa <dancer@netfort.gr.jp> Thu Oct 24 13:55:42 2002
+
--- mpich-1.2.7.orig/debian/README.debian
+++ mpich-1.2.7/debian/README.debian
@@ -0,0 +1,174 @@
+mpich for DEBIAN
+----------------------
+
+MPICH is an implementation of MPI, a protocol of message passing that
+is used widely for clustering machines
+together. Clustering is a way of connecting several computers
+via a network and making them work as one.
+
+The mpich homepage is at http://www.mcs.anl.gov/mpi/mpich/ .  
+
+You need to install MPICH on the "server" machine only. Please note
+that you need to have gcc, g++, or gfortran installed if you want to
+actually do anything with mpicc, mpiCC, mpif77 or mpif90.
+
+
+CONFIGURATION
+-------------
+
+MPICH requires rsh to execute programs, even when working on a single
+node.  If it is not already enabled, you should enable passwordless rsh
+from the local host by adding a line to the file ~/.rhosts saying
+
+localhost username
+
+where username is your login name.  Passwordless rsh may have already
+been enabled by your system administrator.  Make sure that the
+rsh-server package is installed on all machines being used.
+
+MPICH is capable of executing programs in parallel on a cluster of
+workstations.  In this case, you will want to:
+
+ * Mount a common directory containing your executables via NFS on all
+   machines that are to run them.  Try to ensure that the path to this
+   directory is the same on all machines.
+
+ * Modify your .rhosts to allow access from all machines in your cluster.
+   Make this modification to all machines in your cluster if necessary.
+
+ * Edit /etc/mpich/machines.LINUX to list the hostname for
+   each machine that will be participating in your MPICH cluster.
+   If some machines have multiple CPUs or are more powerful you may
+   wish to add more entries for them - no attempt is made at load
+   balancing.  If you are using multiple machines you cannot use
+   localhost as a hostname in /etc/mpich/machines.LINUX, you must use
+   the hostname of the machine.
+
+   It should look something like:
+dave
+michael
+xiaoling
+donald
+
+
+   You may install update-cluster package in Debian GNU/Linux 
+   systems. It will do the configuration of machine list automatically.
+
+Also note it is possible to use ssh instead, but the advantage of using
+it is not obvious. I would recommend against it, but if and only if
+the only remote shell program installed is ssh, then it might be
+feasible. However thinking that you have to install ssh on every
+node of the Beowulf cluster, this is too much of an overhead and
+overload. Using ssh does not make mpich run much more secure than
+using rsh.
+
+
+
+USING MPICH
+-----------
+
+In a nutshell...
+
+To compile MPI programs, use mpicc instead of gcc.  mpicc is a wrapper
+around gcc that sets options appropriate for MPI programs.  mpicc will
+accept all standard gcc options.
+
+To run them, use:
+
+mpirun -np 5 program
+
+The number after np is the "number of processes" or "number of processors"
+value.  You can replace it with whatever number you like.  If you have
+specified multiple machines in /etc/mpich/machines.LINUX, MPICH will use
+as many of them as possible to run your program in parallel.  Otherwise, it
+will fork off a number of processes on your local machine and use Linux's 
+native task switching to simulate true parallelism.  If you have SMP-Linux, 
+the processes will be excuted on separate processors although they will 
+still use the network to communicate.  A future version of the package
+will add support for shared memory communication on SMP systems.
+
+SECURITY
+--------
+
+The Debian MPICH relies on rsh for communcation between computers,
+requiring that it be possible to log in from one system to another
+without supplying passwords.  This means that if the security of one
+account used in a cluster is compromised, all are and can make it easier
+to exploit security problems in the rsh client and server.  Please pay
+due attention to the security of your machines when using this package.
+
+DOCUMENTATION
+-------------
+
+As well as the documentation in /usr/share/doc/mpich and the manual pages
+there is a package mpi-doc containing a set of manual pages for the API.
+
+The MPICH website has lots of good documentation, as does the author's
+general MPI website at http://www.mcs.anl.gov/mpi/ 
+
+There is a book out there called "Parallel Programming with MPI" by Peter S.
+Pacheco.  It is published by Morgan Kaufmann Publishers, ISBN 1-55860-339-5. 
+It seems to be a good introduction to MPI and covers parallel computing as
+well.  You can find details on this book at http://www.usfca.edu/mpi/.
+
+The MPICH authors have also written a book, "Using MPI : Portable Parallel
+Programming With the Message-Passing Interface (Scientific and Engineering
+Computation)" by William Gropp, Ewing Lusk and Anthony Skjellum.
+
+SHARED LIBS
+-----------
+
+shared libraries for MPICH are installed in /usr/lib/mpich*/lib/shared.
+You can NFS export that directory, and mount on child nodes.
+
+mpicc requires that command-line option "-shlib" is given to force
+shared library linking to happen. 
+
+e.g.
+
+$ mpicc -o a.out a.c -shlib
+
+It will create a binary with RPATH set. To remove the RPATH requirement,
+symlinks to the shared libraries are created in /usr/lib
+
+MISCELLANEOUS
+-------------
+
+It is also impossible to use different processor architectures within a
+cluster, as MPICH does not distinguish between different kinds of Linux.
+This is a portability problem with the networking layer of MIPCH, which
+the authors intend to fix by rewriting them.
+
+It's also worth noting that the package is not properly FHS compilaint -
+in particular, the man pages end up in /man
+
+There are some programs which seem not to work satisfactorily because
+files were rearranged in an FHS manner. Namely mpiman and
+others. mpiman works fine, except for the fact that it needs mpich and
+mpi-doc packages installed for it to be working fully.
+
+
+
+DEBIAN SPECIFIC CHANGES
+-----------------------
+
+Log file location is patched to use /var/lib/secure_server.log
+for the secure server
+
+MPE library is made into shared library, as libmpe.so.1.0, and 
+libmpe-p4mpd.so.1.0.
+mpicc is not hacked enough, yet.
+
+libtvmpich is made into shared library, as libtvmpich.so.1.0
+
+MPICH/MPE/MPID install scripts are hacked up to allow DESTDIR 
+when installation.
+
+
+These changes are sent back up to the upstream.
+
+
+ original text by Mark Brown <broonie@debian.org>, updated by Junichi Uekawa
+ and Adam Powell.
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Tue, 12 Jul 2005 17:49:47 -0400
--- mpich-1.2.7.orig/debian/changelog
+++ mpich-1.2.7/debian/changelog
@@ -0,0 +1,848 @@
+mpich (1.2.7-9.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS by adding “-D_GNU_SOURCE” to the CFLAGS in mpid/mpd as
+    suggested by Peter Green and Petr Salinger (Closes: #522007):
+     - 24_use_gnu_source_for_mpd.dpatch
+  * Fix FTBFS on GNU/kFreeBSD by sticking to <termios.h> as specified by
+    POSIX, as suggested by Petr Salinger (Closes: #533246):
+     - 25_use_posix_termios_interface.dpatch
+
+ -- Cyril Brulebois <kibi@debian.org>  Fri, 03 Jul 2009 22:14:10 +0200
+
+mpich (1.2.7-9) unstable; urgency=low
+
+  * Package is now team-maintained by pkg-scicomp (closes:#447678)
+  * Updated standards to 3.8.0
+    - added Homepage field
+    - set debian/compat to 7 and updated debhelper build dependency accordingly
+    - replace call to dh_clean -k by call to dh_prep as suggested by lintian
+  * Fix update-alternative settings for libmpich-mpd1.0-dev and
+    libmpich-shmem1.0-dev (closes: #512426)
+  * fix lintian warning about maintainer scripts ignoring errors
+
+ -- Alexandre Fayolle <afayolle@debian.org>  Mon, 26 Jan 2009 14:03:27 +0100
+
+mpich (1.2.7-8) unstable; urgency=low
+
+  * libmpich1.0-dev conflicts with older mpich-bin because of (formerly
+    useless) mpif90 file in /usr/lib/mpich/bin (closes: #476093).
+  * Turned upstream patch level 1 into patches/13_upstream_patchlevel1.dpatch
+    instead of leaving it in .diff.gz.
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Wed, 16 Apr 2008 15:38:49 -0400
+
+mpich (1.2.7-7.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New patch 23 to fix configure's g++ tests to include iostream instead of
+    iostream.h.  Fixes FTBFS with gcc-4.3.  (Closes: #468068)
+
+ -- James Vega <jamessan@debian.org>  Sun, 09 Mar 2008 00:10:37 -0500
+
+mpich (1.2.7-7) unstable; urgency=low
+
+  * Fixed shared library packages (thanks to Kumar Appaiah) (closes: #465285).
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Mon, 11 Feb 2008 18:41:43 -0500
+
+mpich (1.2.7-6) unstable; urgency=low
+
+  * Working gfortran support (thanks to Kumar Appaiah <akumar@ee.iitm.ac.in>).
+  * This release also includes mpif90 (closes: #195509).
+  * Changed shlib package names to gf reflecting the interface change due to
+    the g77-gfortran transition.
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Fri, 01 Feb 2008 16:06:59 -0500
+
+mpich (1.2.7-5) unstable; urgency=low
+
+  * debian/rules: Fix bashisms (thanks to Luke Yelavich <themuso@ubuntu.com>)
+    (closes: #459110).
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Sun, 27 Jan 2008 18:48:54 -0500
+
+mpich (1.2.7-4) unstable; urgency=low
+
+  * Correct Conflicts/Replaces on libmpich1.0c2 (closes: #443787).
+  * Add Conflicts/Replaces for -mpd and -shmem variants.
+  * Moved MPI_Comm_set_name manpage to mpi-doc-specific filename, added
+    alternatives symlink; will eventually close 310688.
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Thu,  4 Oct 2007 11:20:17 -0400
+
+mpich (1.2.7-3.1) unstable; urgency=medium
+
+  * NMU
+  * Adds Conflicts/Replaces on libmpich1.0c2 to libmpich1.0ldbl
+    (Closes: #441882)
+
+ -- Ari Pollak <ari@debian.org>  Sun, 23 Sep 2007 10:53:22 -0400
+
+mpich (1.2.7-3) unstable; urgency=low
+
+  * Corrected alternatives removal in prerm (closes: #306305).
+  * Removed clog2slog and upshot links, as these are no longer built
+    (closes: #394807).
+  * Included patch allowing building on hurd-i386 (closes: #420457).
+  * Renamed libraries for long double transition (closes: #430274, #430275,
+    #430276).
+  * Various changes for updated lintian cleanliness.
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Thu,  6 Sep 2007 10:37:56 -0400
+
+mpich (1.2.7-2) unstable; urgency=low
+
+  * Update to upstream patch level 1, contained in .diff.gz.
+  * This includes old patch 13 for safely handling spaces in the binary path.
+  * New patch 19 required to avoid symbol collision.
+  * Rebuild should use new symbols from libc_nonshared.a (closes: #355569).
+  * Shared libs conflict with non-c2 old versions (closes: #349430).
+  * Corrected mpich-bin.prerm alternative to match postinst (closes: #306305).
+  * Removed obsolete clog2slog and upshot symlinks (closes: #346510).
+  * Included Petr Salinger's mechanism for updating files from installed
+    autotools-dev package (closes: #333001).
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Fri,  6 Oct 2006 16:11:53 -0400
+
+mpich (1.2.7-1) unstable; urgency=low
+
+  * Unstable port of sarge backport testbed packages, with much help from NMU
+    by Adeodato Simó (closes: #317467, #321052, #321093, #321158).
+  * Includes fixes from rejected 1.2.5.3-6 (closes: #306305, #314173, #253422).
+  * Change -noslog to c2 in library package names to reflect new C++ ABI.
+  * Make sure all mpich shlibs correctly link dependent libs based on patch by
+    Adeodato Simó (debian/patches/18...), slightly edited for 1.2.7.
+  * Added -f90=gfortran to build Fortran 90 backend, and removed Fortran 90
+    disabling code in debian/rules.
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Fri, 12 Aug 2005 17:59:03 -0400
+
+mpich (1.2.7-0sarge2) unstable; urgency=low
+
+  * Added generated files in debian/ to rules clean target using a patch by
+    Adeodato Simó (will close 321052 upon upload to unstable).
+  * Added -noslog to shared library package names to acknowledge API change
+    (slog dropped) and avoid dependency breakage in sarge.
+  * Fixed libpmpich-[p4mpd,shmem]++.so symlinks using a patch by Adeodato Simó
+    (will close 321158 upon upload to unstable).
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Fri, 12 Aug 2005 17:25:46 -0400
+
+mpich (1.2.7-0sarge1) testing; urgency=low
+
+  * New upstream release.
+  * Unofficial sarge backport will serve as basis for new unstable.
+  * Removed all of slog including much of patch 02 since slog_apy is now gone.
+  * Deactivated patches 08 and 11 because upstream seems to have included them.
+  * Added tk8.4 to Build-Depends (will close 317467 upon upload to unstable).
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Tue, 12 Jul 2005 18:50:56 -0400
+
+mpich (1.2.5.3-6) unstable; urgency=low
+
+  * Removed mpich and mpich-mpd packages which were deprecated in sarge.
+  * Updated DH_COMPAT and standards version.
+  * Fixed mpich-bin.prerm to remove alternatives symlinks (closes: #306305).
+  * Fixed libmpi++.so link in libmpich1.0-dev.postinst (closes: #314173).
+  * Added ch_shmem transport for performance on SMP systems (closes: #253422).
+  * Updated TODO file closing items which have been done.
+  * Rebuild using new gcc default version (4.0) to make sure C++ is okay.
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Thu,  7 Jul 2005 14:53:37 -0400
+
+mpich (1.2.5.3-5) unstable; urgency=low
+
+  * Declared a conflict between mpi-doc and lam4-dev (closes: #299198).
+  * libmpich-mpd1.0 conflicts/replaces libmpich-p4mpd1.0 (closes: #299534).
+  * Patch by Andreas Jochens <aj@andaco.de> for amd64/gcc4.0 (closes: #298700).
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Thu, 24 Mar 2005 05:44:59 +0900
+
+mpich (1.2.5.3-4) unstable; urgency=low
+
+  * Changed "rm" to "rm -f" in debian/rules (closes: #296061).
+  * Removed dangling logviewer manpage symlink (closes: #297128).
+  * Changed rsh-server dependencies of -bin packages to Suggests.
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Tue,  1 Mar 2005 12:57:32 -0500
+
+mpich (1.2.5.3-3) unstable; urgency=low
+
+  * Changed "rmdir" to "rm -rf" to remove share/upshot/sbin directory if it's
+    there (and not if it's not) (closes: #296061).
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Wed, 23 Feb 2005 01:21:08 -0500
+
+mpich (1.2.5.3-2) unstable; urgency=low
+
+  * Package reorganization: mpich(-mpd) split into mpich(-mpd)-bin and
+    libmpich(-mpd)1.0-dev, the latter having the static libs, shared lib
+    symlinks, compiler and other dev-related commands, and code examples.
+  * Removed mpich-common and moved its man1 manpages to the mpich(-mpd)-bin
+    packages and other docs to mpi-doc.
+  * Made mpirun etc. alternatives symlinks into /usr/lib/mpich(-mpd)/bin.
+  * Put chp4_servs, cleanipcs and tstmachines symlinks in /usr/bin.
+  * Changed wish Recommends to Suggests.
+  * Make libtvmpich shlib name depend on package to avoid shlib conflicts.
+  * Build ROMIO with -fPIC (closes: #281594).
+  * Make libpmpich++ shared lib with -fPIC (closes: #242366).
+  * Fixed all shlib symlinks (closes: #282258, #286725).
+  * Made binary target depend on build-stamp to avoid double build (!).
+  * Changed mpiCC symlink to point to mpich(-mpd)/bin/mpicxx (closes: #281573).
+  * Applied Vaclav Juza's patch for util/mpirun.args.in and
+    mpid/ch_p4/mpirun.ch_p4.in to allow spaces in current directory (closes:
+    #252299).
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Wed, 22 Dec 2004 13:11:33 -0500
+
+mpich (1.2.5.3-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for sarge-targetted RC bugfix
+  * Since lib*.so.1 have been removed, make sure the lib*.so symlinks
+    point to the actual library files (closes: #282258).
+
+ -- Steve Langasek <vorlon@debian.org>  Sun,  5 Dec 2004 16:13:32 -0800
+
+mpich (1.2.5.3-1) unstable; urgency=low
+
+  * New upstream release (closes: #262126).
+  * Now includes -MT, -MQ, -MF -MM in mpiCC script (closes: #199650, #262356).
+  * Refined X lib Build-Depends, libmpich1.0 should follow automatically
+    (closes: #246740, #271753).
+  * Removed useless lib*.so.1 symlinks (closes: #214624).
+  * Stripped "index" argument name from mpio.h to avoid unnecessary warnings.
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Wed,  3 Nov 2004 17:07:24 -0500
+
+mpich (1.2.5.2-1) unstable; urgency=low
+
+  * New upstream (closes: #212036).
+  * Removed patch 01 from 00list because upstream seems to have applied it.
+  * Patch 02 forward-ported, now includes slog libname stuff from .diff.gz.
+  * Forward-ported patches 03, 04, 05, 06, 07 and 10.
+  * Patch 08 moves MPI_Handler_function typedef below #include "mpidefs.h" so
+    USE_STDARG is defined in time (closes: #207868).
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Tue,  7 Oct 2003 14:03:30 -0400
+
+mpich (1.2.5-6) unstable; urgency=low
+
+  * Patch 05 changes shared libtvmpich linking from "makesharedlib" to straight
+    "cc" so it should build on all arches (closes: #196845).
+  * Patch 06 fixes home directory in mpich-mpd's mpichboot (closes: #198202).
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Fri, 20 Jun 2003 17:57:34 -0400
+
+mpich (1.2.5-5) unstable; urgency=low
+
+  * Changed mv to mv -f to put shlibs in /usr/lib/mpich(-mpd)/lib into shared
+    lib packages, since the lib(s) there are apparently not generated on s390
+    or sparc.
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Tue, 20 May 2003 18:33:43 -0400
+
+mpich (1.2.5-4) unstable; urgency=low
+
+  * Removed rpath from mpe and slog lib linking commands in patch 02...
+  * Generalized symlink commands so mpe and slog shlibs get symlinked to
+    /usr/lib (closes: #186885).
+  * Had to add --with-sloglibname arg to mpe/configure.in and
+    mpe/slog_api/configure.in (and configure too) to prevent library namespace
+    collision between slog libs in mpich and mpich-mpd shared lib packages.
+  * Added libslog.so to libmpe.so for linking in mpd shared lib subdir.
+  * Fixed install-slog to do shlib symlinks right.
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Mon, 19 May 2003 15:44:47 -0400
+
+mpich (1.2.5-3) unstable; urgency=low
+
+  * New maintainer is all for now, more changes later. (closes: 189853)
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Sun, 20 Apr 2003 12:08:27 -0400
+
+mpich (1.2.5-2) unstable; urgency=low
+
+  * Try compiling mpd with CFLAGS (patch 10). (closes: #176954)
+  thanks to lamont.
+  * do error checking of failed links. (patch 07)
+
+ -- Junichi Uekawa <dancer@debian.org>  Thu, 16 Jan 2003 19:15:10 +0900
+
+mpich (1.2.5-1) unstable; urgency=low
+
+  * New upstream release
+  * Forward-port Debian patches: 
+   -  DESTDIR
+   -  shared library -- forwarded upstream (again)
+    included patches:
+   - compile .s files.
+  * work-around missing libg2c link with -lib=g2c to ./configure.
+  * Recompiling with gcc-3.2
+  * use dpatch system.
+   - Build-Depends on dpatch
+   - create debian/patches/
+      01_destdir -- $DESTDIR patch
+      02_mpeshlibs -- shared library for MPE and libslog
+      03_move_logfile -- log file is in /var/log
+      04_hackg2c -- hack to link with g2c.
+
+ -- Junichi Uekawa <dancer@debian.org>  Mon, 13 Jan 2003 19:07:26 +0900
+
+mpich (1.2.4-11) unstable; urgency=low
+
+  * Fix up mpe include files, mpeinstall script checked for $includedir without 
+  $DESTDIR.
+
+ -- Junichi Uekawa <dancer@debian.org>  Fri, 20 Dec 2002 17:20:25 +0900
+
+mpich (1.2.4-10) unstable; urgency=low
+
+  * mpe/src/Makefile.in, mpe/slog_api/src/Makefile.in:
+  Move mpe libs to /usr/lib/mpich/lib/shared/ dir along with mpich libs.
+  The shared/ dirs are meant to be sharable among NFS-shared hosts.
+  (closes: #170573), thanks Adam C Powell IV <hazelsct@mit.edu>
+  * Explicitly specify to install libs into /usr/lib/mpich/lib/shared/
+  * mpe/viewers/sbin/install-viewers.in, mpe/viewers/upshot/sbin/install-viewer.in: 
+    fix up to use DESTDIR.
+  * debian/rules: reduce the number of hacks for shuffling around the
+    shared libraries, because MPICH install was fixed.
+    (my new strategy is to fix upstream install scripts rather
+    than hack around it)
+  * with an attempt with 1.2.4-9, libslog is available now, and 
+    libmpe.so is linked with X11, -lslog, and -lm. (closes: #168831)
+  * README.Debian: update the notes wrt the changes that are local to
+    Debian.
+
+ -- Junichi Uekawa <dancer@debian.org>  Wed, 18 Dec 2002 18:10:39 +0900
+
+mpich (1.2.4-9) UNRELEASED; urgency=low
+
+  * debian/rules: more cleaning.
+  * mpe/slog_api/src/Makefile.in: hack up to make shared library for libslog.
+  * mpe/src/Makefile.in: link libmpe with -L /usr/X11R6/lib -lX11 -L ../slog_api/lib -lslog.
+  * seems not to be installing slog libs, force-run sloginstall in debian/rules.
+  * Complete rehaul of the build system.
+  - util/mpiinstall.in: hack to use DESTDIR properly.
+  - mpe/sbin/mpeinstall.in: hack to use DESTDIR properly.
+  - mpe/slog_api/sbin/install-slog.in: hack to use DESTDIR properly.
+  * Move over libmpe.so from libmpich-p4mpd1.0 to mpich-mpd package, and 
+  add Replaces:. It was a mistake.
+
+ -- Junichi Uekawa <dancer@debian.org>  Tue, 17 Dec 2002 23:01:47 +0900
+
+mpich (1.2.4-8) unstable; urgency=low
+
+  * use CLINKER to link instead of MPI_CLINKER wrapper over cc.
+  I think that should fix build failure on hppa and ia64.
+  Using mpicc to link, it is trying to link in some static libs also.
+  (closes: #167036)
+  
+ -- Junichi Uekawa <dancer@debian.org>  Wed, 30 Oct 2002 18:17:21 +0900
+
+mpich (1.2.4-7) unstable; urgency=low
+
+  * Create shared version of mpe libs. (closes: #143192)
+  * shared libraries for two versions are in /usr/lib/mpich*/lib/libmpe.so 
+  It should work, with rpath settings and other things.
+  Try with: -Wl,-soname,lib$(PROF_LIBNAME).so.1.0 -Wl,-rpath,$(libdir) 
+  * libmpe-p4mpd.so is availble for -mpd, and libmpe.so symlink is provided.
+  * updated TODO files for a change.
+  * update README.Debian for a change.
+
+ -- Junichi Uekawa <dancer@debian.org>  Thu, 24 Oct 2002 17:28:25 +0900
+
+mpich (1.2.4-6) unstable; urgency=low
+
+  * util/mpicc.in: handle *.s files as input (closes: #164359)
+  Reported by nbreen@ofb.net (Nicholas Breen).
+  * Standards-Version: 3.5.7, no change.
+  * Apply upstream patch:
+  - 7073  Fix the computation of the LB (lower bound) of indexed datatypes
+  - 7090  Correct the computation of the lb for a struct type
+
+ -- Junichi Uekawa <dancer@debian.org>  Tue, 15 Oct 2002 16:26:10 +0900
+
+mpich (1.2.4-5) unstable; urgency=low
+
+  * mpi-doc: changed .3 manpages to .3mpich, so that conflicts with LAM is resolved.
+    (closes: #150629, #150194)
+  * Temporarily patch mpid/server/serv_p4.c to use /var/log/secure_server.log instead of 
+    /usr/adm/secure_server.log (closes: #151121)
+
+ -- Junichi Uekawa <dancer@debian.org>  Mon, 22 Jul 2002 14:51:12 +0900
+
+mpich (1.2.4-4) unstable; urgency=low
+
+  * moved doc files to -common package, on the way fixing the uninstallable
+    bug.
+    (closes: #150048)
+  * mpich-common replaces files in mpich and mpich-mpd prior to this version
+
+ -- Junichi Uekawa <dancer@debian.org>  Sat, 15 Jun 2002 18:19:01 +0900
+
+mpich (1.2.4-3) unstable; urgency=low
+
+  * Initial upload to unstable. New upstream version (closes: #144073)
+  * Try and build shared libraries (closes: #143192, #82038)
+  * set -mpilibname=mpich-p4mpd for mpd version.
+  * add shlibs.local
+  * add libmpich1.0 package, libmpich-mpd1.0 package.
+  * add notes to README.Debian about shlibs compilation
+  * mpich.postinst.in: fix update-alternatives to point to mpich-common 
+    manpages, instead of mpich/mpich-mpd, because manpage moved.
+  * There is no longer such "you should configure" message. (closes: #67992)
+  * Improve package description for mpe-source (closes: #128104)
+
+ -- Junichi Uekawa <dancer@debian.org>  Tue, 11 Jun 2002 00:17:51 +0900
+
+mpich (1.2.4-2) experimental; urgency=low
+
+  * support backport to potato, build-depend on xlibs-dev | xlib6g-dev
+    (not uploaded to Debian)
+
+ -- Junichi Uekawa <dancer@debian.org>  Fri, 17 May 2002 14:50:05 +0900
+
+mpich (1.2.4-1) experimental; urgency=low
+
+  * New upstream release
+  * Build-Depends: s/xlib6g-dev/xlibs-dev
+  * shift manpages around
+  * forward port symlink fix from mpich in sid
+  * more strict depends on mpich-common. mpich-common replaces old mpich
+  * mpid/mpd/Makefile.in: applied fix for -prefix override.
+
+ -- Junichi Uekawa <dancer@debian.org>  Mon, 13 May 2002 14:57:59 +0900
+
+mpich (1.2.3-0.1) experimental; urgency=low
+
+  * New upstream release. Not released to Debian 
+
+ -- Junichi Uekawa <dancer@debian.org>  Wed,  1 May 2002 19:06:45 +0900
+
+mpich (1.2.2.2-0.2) experimental; urgency=low
+
+  * Even more experimental releases (not uploaded to Debian)
+  * created mpich-common package to allow for coexistence of 
+    mpich and mpich-mpd package. -- do the transition ... how?
+
+ -- Junichi Uekawa <dancer@debian.org>  Mon,  7 Jan 2002 12:46:52 +0900
+
+mpich (1.2.2.2-0.1) experimental; urgency=low
+
+  * newer upstream release (never uploaded) fork from 1.2.1-12
+  * dh_suidregister is removed.
+  * fixed some bugs with mpich-mpd handling, and renaming things in fixup.sh
+  * debian/TODO: updated
+  * added symlinks for mpichboot and mpichstop for /usr/bin in mpich-mpd package.
+  * patched mpd makefile.in to not to set prefix in configure time
+  * fixup.sh: mpiboot includes reference to the content of ${HOME}
+    while building, such as /home/username,
+    and that is modified to ${HOME}.
+  * Thinking of future ways to do things -- debian/mpd-makefile.patch
+    exists, but not used. Patch is in the Debian diff.
+  * (NOTE: this package is not Debian Official)
+  * include examples directory for fixup.sh target, so that Makefile
+    etc. can be fixed
+  * removed /usr/lib/mpich/share/Makefile.sample, which was useless
+  * updated debian/control to sync with mpich 1.2.1-14
+  * added mpich-mpe-source package, which contains source to MPE.
+  * renamed the package name to mpe-source as per suggestion from
+    debian-beowulf mailing list.
+  * fixed typo in debian/control for description of mpe-source
+  * fixed typo in debian/control for description of mpich/mpi-doc
+    as noted by Matt Zimmerman
+  * moved around debian/rules, the rule to build indep targets, so
+    that it won't waste autobuilders time.
+  * moved bzip2 over to Build-Depends-Indep
+  * fixed doc-base conflict. Both were called mpich, renamed one to mpich-mpd
+
+  (some changelogs for 1.2.2 prerelease package, which was never uploaded to
+   Debian. Forked from mpich 1.2.1-12)
+  * debian/control: updated to policy 3.5.6, no change
+  * removed a rm examples/MPI-2-C++/mpirun, which no longer seems to exist
+
+  * fixed typo in links file, there should be a mpirun_dbg
+
+  * Trying to get mpirun_dbg to be working -- suspecting that it is broken
+  * Getting mpich-mpd package built.
+  * preinst, postinst, prerm, dirs, doc-base is moved to "in"
+
+  * finally, the reference to the build system is removed.. (it seems)
+  * fixed override disparity with mpi-doc priority being "optional"
+  * fix conffiles, to be of right value for mpich and mpich-mpd
+  * Fix mpd binaries' symlinks in debian/rules.
+
+ -- Junichi Uekawa <dancer@debian.org>  Wed, 19 Dec 2001 19:51:16 +0900
+
+mpich (1.2.1-17) unstable; urgency=low
+
+  * debian/rules: fixed symlink for man{1,2,4} in /usr/lib/mpich/man,
+  thanks Gordon Sadler for noticing this. (closes: #144075)
+  * remove reference to dh_suidregister in debian/rules.
+
+ -- Junichi Uekawa <dancer@debian.org>  Tue, 30 Apr 2002 18:47:08 +0900
+
+mpich (1.2.1-16) unstable; urgency=low
+
+  * fixed typo in debian/control, for mpi-doc and mpich, after the
+    great spelling check, by Matt Zimmerman (closes: #125154)
+    and (closes: #125153)
+
+ -- Junichi Uekawa <dancer@debian.org>  Wed, 19 Dec 2001 19:49:00 +0900
+
+mpich (1.2.1-15) unstable; urgency=low
+
+  * mpe-source package is added, to allow LAM to build with 
+    MPE source that is bundled with MPICH source. (backported from
+    1.2.2.2 package)
+  * Build-depends on bzip2
+
+ -- Junichi Uekawa <dancer@debian.org>  Sun, 18 Nov 2001 06:47:12 +0900
+
+mpich (1.2.1-14) unstable; urgency=low
+
+  * fixing priority
+  * fixing fixup.sh to fix the Makefiles (which used to contain the 
+    build directory info etc.)
+  * changing description mpi-doc, to clarify that it is a documentation
+    for an implementation of MPI, namely MPICH, and not the actual
+    documentation of the MPI standard as such. MPI standard
+    is packaged separately. (closes: #116248)
+
+ -- Junichi Uekawa <dancer@debian.org>  Sat, 20 Oct 2001 13:17:58 +0900
+
+mpich (1.2.1-13) unstable; urgency=low
+
+  * Fixing a nonexistent upshot problem (closes: #112905)
+  * updated the TODO file.
+
+ -- Junichi Uekawa <dancer@debian.org>  Fri, 21 Sep 2001 17:18:50 +0900
+  
+mpich (1.2.1-12) unstable; urgency=low
+
+  * "Maintenance before release" package.
+  * fix the description, removing (rsh version) from it. (closes: #108505)
+  * change the build-deps to "g77" instead of "fortran77-compiler"
+    The compiler should be non-ambiguous.
+  * removed the reference to deprecated dh_testversion
+  * [mpich.updatelist] Changed cluster.xml file direct reference to $CLUSTERXML
+  * Removed the emacs variable from debian/changelog
+
+ -- Junichi Uekawa <dancer@debian.org>  Wed, 29 Aug 2001 00:47:22 +0900
+
+mpich (1.2.1-11) unstable; urgency=low
+
+  * handle update-cluster 0.5.
+
+ -- Junichi Uekawa <dancer@debian.org>  Wed,  8 Aug 2001 16:08:37 +0900
+
+mpich (1.2.1-10) unstable; urgency=low
+
+  * added support for update-cluster
+
+ -- Junichi Uekawa <dancer@debian.org>  Sat, 28 Jul 2001 23:10:37 +0900
+
+mpich (1.2.1-9) unstable; urgency=low
+
+  * compilation error fixed, thanks go to tausq for reporting it.
+    (closes: #103785)
+  * removes build-dep for gdb, since it doesn't really seem necessary
+  * added hooks to create mpd versions.
+
+ -- Junichi Uekawa <dancer@debian.org>  Sat,  7 Jul 2001 17:37:28 +0900
+
+mpich (1.2.1-8) unstable; urgency=low
+
+  * removes reference to ssh from the Depends line (closes: #96872)
+  * Bump standards-version to 3.5.5
+
+ -- Junichi Uekawa <dancer@debian.org>  Sun, 24 Jun 2001 00:30:38 +0900
+
+mpich (1.2.1-7) unstable; urgency=low
+
+  * rebuilding with newer libs
+
+ -- Junichi Uekawa <dancer@debian.org>  Sun,  6 May 2001 22:42:28 +0900
+
+mpich (1.2.1-6) unstable; urgency=low
+
+  * debian/control: Maintainer: field is updated to point to dancer@debian.org
+
+ -- Junichi Uekawa <dancer@debian.org>  Wed, 28 Feb 2001 01:21:55 +0900
+
+mpich (1.2.1-5) unstable; urgency=low
+
+  * debian/rules: Removed Jumpshots manpage (it should not be there)
+  * debian/rules, debian/clog2alog.1, debian/clog_print.1,
+    debian/slog_print.1, debian/clog2slog.1, debian/mpereconfig.1,
+    debian/upshot.1: No more undocumented.7.gz manpages.
+  * debian/control, debian/rules: made specific debhelper version
+    requirement.
+  * debian/control: bumping standards-version to 3.5.2
+
+ -- Junichi Uekawa <dancer@debian.org>  Tue, 27 Feb 2001 01:31:31 +0900
+
+mpich (1.2.1-4) unstable; urgency=low
+
+  * debian/rules: add no-debug options, but nothing seems to change.
+    not even the filesize of the package
+  * debian/mpi-doc.doc-base: added an entry for the MPI reference manual
+  * debian/mpich.doc-base: added an entry for MPICH User's guide
+  * debian/rules: cleaned up the process of fixing up the package slightly
+  * debian/rules: handles DEB_BUILD_OPTIONS option "debug"
+  * debian/fixup.sh: cleans up more reference to local build directories
+  * debian/mpich.links: install symlinks for accessing MPE commands.
+  * debian/rules: MPE commands are not documented in a manpage, so installed
+    undocumented symlinks.
+  * debian/control: updated to policy 3.2.1.
+  * changed maintainer mail address to dancer@debian.org
+
+ -- Junichi Uekawa <dancer@debian.org>  Wed, 14 Feb 2001 07:04:01 +0900
+
+mpich (1.2.1-3) unstable; urgency=low
+
+  * debian/rules: fix up some disorder of non-policy-conformant file
+    locations, (closes: #84104)
+  * debian/control: Changed the dependency so that mpich can be installed
+    when ssh is installed. (closes: #46555) (closes: #67191)
+  * debian/mpich.postinst: Fixed alternatives to have libmpich++ to link
+    to something decent.
+  * shared libs can be compiled (see debian/rules) (but something is still wrong).
+
+ -- Junichi Uekawa <dancer@netfort.gr.jp>  Wed, 31 Jan 2001 01:17:07 +0900
+
+mpich (1.2.1-2) unstable; urgency=low
+
+  * Alpha which seems to have machines.LINUX_ALPHA instead of 
+    machines.LINUX -- temporary fix is to link machines.LINUX_ALPHA
+    to /etc/mpich/machines.LINUX.  All the other arches have the 
+    same conffile. So, I have done a quick hack to have the two files
+    linking at the same thing.
+
+ -- Junichi Uekawa <dancer@netfort.gr.jp>  Sat, 20 Jan 2001 02:25:30 +0900
+
+mpich (1.2.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Removed the shared libs built automatically.
+    Future plan to create -shlibs versions of package.
+  * Added libmpi++.a into the update-alternatives.
+  * Fixed a bug.. Now calls update-alternatives --remove in
+    prerm
+  * Fixed a mpiinstall feature so that it doesn't try to write into
+    /usr/lib/mpich at compile time.
+  * Added undocumented manpage for mpereconfig.
+
+ -- Junichi Uekawa <dancer@netfort.gr.jp>  Thu, 14 Dec 2000 13:02:27 +0000
+
+mpich (1.2.0-3) unstable; urgency=low
+
+  * Changed a wrong update-alternatives in postinst, with regard to
+    libmpi.a (closes: #67793)
+
+ -- Junichi Uekawa <dancer@netfort.gr.jp>  Thu, 27 Jul 2000 23:22:35 +0900
+
+mpich (1.2.0-2) unstable; urgency=low
+
+  * Added a missing build-dependency on debhelper (closes: #67704)
+
+ -- Junichi Uekawa <dancer@netfort.gr.jp>  Wed, 26 Jul 2000 16:22:05 +0900
+
+mpich (1.2.0-1) unstable; urgency=low
+
+  * New maintainer and new upstream release
+  * /sbin/chkserv is removed, will put back later if necessary
+  * mpi-doc conflicts with mpich << 1.1.2
+  * fixed a typo in debian/rules for deleting mpiman etc.
+  * /usr/lib/mpich/bin/mpiman should work almost per advertosed
+  * Cleaned .diff.gz so that nothing that is autogenerated is included.
+
+ -- Junichi Uekawa <dancer@netfort.gr.jp>  Sat, 22 Jul 2000 20:19:26 +0900
+
+mpich (1.1.2-11) unstable; urgency=low
+
+  * Fix build dependancies (closes: #54258).
+
+ -- Mark Brown <broonie@debian.org>  Fri,  7 Jan 2000 10:42:28 +0000
+
+mpich (1.1.2-10) unstable; urgency=low
+
+  * Seperate runtime and development slave links.
+  * Add build depends to update to policy 3.1.1.
+
+ -- Mark Brown <broonie@debian.org>  Mon,  3 Jan 2000 13:32:19 +0000
+
+mpich (1.1.2-9) unstable; urgency=low
+
+  * Configure without comm=shared (closes: #49827).
+ 	
+ -- Mark Brown <broonie@debian.org>  Sat, 13 Nov 1999 02:02:28 +0000
+
+mpich (1.1.2-8) unstable; urgency=low
+
+  * Make mpicc and friends alternatives (closes: #47321).
+
+ -- Mark Brown <broonie@debian.org>  Sun, 16 Oct 1999 01:56:03 +0100
+
+mpich (1.1.2-7) unstable; urgency=low
+
+  * Update to policy 3.0.1 (FHS) ignoring /usr/lib/mpich contents.
+  * Delete symlinks in /usr/lib/mpich/man in preinst for both packages
+    in order to ensure that they get replaced by directories correctly.
+    (closes: #45315).  
+  * Depend on rsh-client rather than netstd since that is now a seperate
+    package.  Also recommend rsh-server, which is almost certainly also
+    going to be needed.
+
+ -- Mark Brown <broonie@debian.org>  Tue,  7 Sep 1999 22:25:16 +0100
+
+mpich (1.1.2-6) unstable; urgency=low
+
+  * Update copyright information to record applied patches.
+  * Don't update to policy 3.0.0 since I don't want to work around
+    debhelper in this package.
+
+ -- Mark Brown <broonie@debian.org>  Tue, 27 Jul 1999 10:29:18 +0100
+
+mpich (1.1.2-5.1) unstable; urgency=low
+
+  * Non-maintainer upload: recompiled on a potato system.
+    With agreement of maintainer.
+
+ -- Philipp Frauenfelder <pfrauenf@debian.org>  Sun, 16 May 1999 17:46:03 +0200
+
+mpich (1.1.2-5) unstable; urgency=low
+
+  * Fixed argument checking in mpich prerm.
+  * Removed lib symlink and updated alternatives to match, fixing
+    problems with the symlink not being created when upgrading from
+    slink (bug #36662).
+  * mpich postinst is now non-interactive.
+  * Simplified sed usage in fixup.sh.
+  * mpi-doc postinst and prerm also check arguments (d'oh!).
+
+ -- Mark Brown <broonie@debian.org>  Mon, 26 Apr 1999 15:32:34 +0100
+
+mpich (1.1.2-4) unstable; urgency=low
+
+  * Apply upstream patches:
+    - 4180: Handle null requests correctly in WAITANY and TESTANY.
+    - 4169: Fix filesystem determination code.
+    - 4152: Minor fixes to testsuite programs.
+    - 4224: Remove unneeded FILE initializers (includes some of the
+            previous Debian glibc fixes).
+  * Install examples from MPE contrib directory.
+  * Enable compiler optimizations.
+  * postinst and prerm now check their arguments.
+
+ -- Mark Brown <broonie@debian.org>  Wed, 31 Mar 1999 00:28:35 +0100
+
+mpich (1.1.2-3) unstable; urgency=low
+
+  * Patch to build under glibc2.1 (the i386 package is still built
+    against glibc2.0).
+  * Install MPI reference manual from ref in mpi-doc as ref.ps.
+  * Install some documentation from p4 subsystem.
+  * Downgrade priority to extra - MPI is not precisely mainstream.
+  * Correct spelling mistake in control file.
+
+ -- Mark Brown <broonie@debian.org>  Sun, 28 Mar 1999 01:26:15 +0000
+
+mpich (1.1.2-2) unstable; urgency=low
+
+  * Move manual pages to /usr/lib/mpich/man (more bug #32729).
+  * debian/rules: clean really cleans, remove hardcoded directory
+    (fixes bug #34059).
+  * Install user's guide and bibliography.
+  * Fix more installed references to build directory.
+  * Updated MPI.1 manual page to refer to Debian package.
+
+ -- Mark Brown <broonie@debian.org>  Thu,  4 Mar 1999 02:37:00 +0000
+
+mpich (1.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Repackaged using debhelper.
+  * Split MPI manual pages into seperate mpi-doc package so they may be
+    used by people using other MPI implementations.
+  * Enable shared memory communication within nodes.
+  * Supply Fortran 77 and C++ bindings (fixes wishlist bug #29772).
+  * mpiman now finds man pages (fixes bug #32729).
+  * Install more of the supplied documentation and examples.
+  * Both packages support doc-base.
+
+ -- Mark Brown <broonie@debian.org>  Tue,  2 Feb 1999 22:11:16 +0000
+
+mpich (1.1.0-6) frozen unstable; urgency=low
+
+  * Correctly install mpirun.1.gz.
+
+ -- Mark Brown <broonie@debian.org>  Wed, 20 Jan 1999 18:26:30 +0000
+
+mpich (1.1.0-5) frozen unstable; urgency=low
+
+  * Conflict with LAM version 6.1 and older.  These versions of LAM 
+    install files in main directories which are part of the standard
+    MPI interface.
+  * Use alternatives to provide /usr/include/mpi, mpirun and libmpi.
+    The real files remain as they were.  This fixes bug #30231 and
+    provides compatibility with other implementations of MPI.
+  * Add dependancy on netstd for rsh.
+  * Removed "bogus" from the default machines.LINUX.  The package
+    should work out of the box as far as possible.
+  * Cleaned up and corrected README.Debian.  Added a brief warning
+    about the security of rsh.
+  * Force installation of header files, clearing up intermittent build
+    problems.
+  * This rebuild removes the version-specific libc6 dependancy.
+
+ -- Mark Brown <broonie@debian.org>  Wed, 16 Dec 1998 18:37:13 +0000
+
+mpich (1.1.0-4) frozen unstable; urgency=low
+
+  * Make /etc/mpich/machines.LINUX a conffile.
+  * Fixed examples symlink in /usr/doc/ (fixes bug #25342 and part of
+    #30231).
+  * Fixed use of stderr as constant initializer (fixes bugs #29882
+    and #29592) (hand-apply patch from Christian Meder).
+  * Provide mpireconfig.  This involves rewriting references to the
+    build directory in config.status in terms of /usr/mpich
+    (fixes bugs #18812, #24463 and #26017).
+  * Don't install machines.sample in /etc/mpich, install it in doc
+    directory (fixes part of bug #30231).
+  * Slightly fixed & expanded README.Debian.
+  * New maintainer.
+
+ -- Mark Brown <broonie@debian.org>  Fri, 4 Dec 1998 00:00:00 +0000
+
+mpich (1.1.0-3.1) frozen unstable; urgency=low
+
+  * non maintainer, sparc only upload
+  * fix initializer element not constant bugs with glibc2.1
+
+ -- Christian Meder <meder@isr.uni-stuttgart.de>  Fri, 20 Nov 1998 16:20:43 +0100
+
+mpich (1.1.0-3) unstable; urgency=low
+
+  * Fixed the copyright file.  Now has real info in it.
+  * Many fixes to build.  Now installs mainly in /usr/lib/mpich instead
+    of all over like before.
+  * A new fixit.sh script has been added to the sourcepackage to help
+    move files around to the right locations.
+
+ -- John Goerzen <jgoerzen@complete.org>  Thu, 12 Feb 1998 19:37:21 -0600
+
+mpich (1.1.0-2) unstable; urgency=low
+
+  * Build fixes
+
+ -- John Goerzen <jgoerzen@complete.org>  Wed, 11 Feb 1998 23:01:04 -0600
+
+mpich (1.1.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- John Goerzen <jgoerzen@complete.org>  Fri,  6 Feb 1998 19:50:40 -0600
+
--- mpich-1.2.7.orig/debian/fixup.sh
+++ mpich-1.2.7/debian/fixup.sh
@@ -0,0 +1,42 @@
+#! /bin/bash
+#fixup routine (Makefile got too crowded.)
+# 15 jul 2000 Junichi Uekawa -- taken from original MPICH fixup.sh
+# 27 jan 2001 Junichi Uekawa <dancer@debian.org> -- modified a bit.
+# 13 Oct 2001 Junichi Uekawa <dancer@debian.org> -- modified for 1.2.2.2 build system
+
+echo Doing extra installation
+#
+# MPICH does seem to have "mpich/" and "mpich/debian/tmp" prefices
+# and it needs to be hacked.
+# -- this is because MPICH needs mpicc et al for installation
+# and before installation is finished we cannot put it in 
+# /usr/share/lib... etc. 
+#
+# only wreck script files or binary files being overwritten
+# will cause major problems.
+dir=`pwd`
+
+#just to make sure "file" will output an understandable output
+LANG=C
+LC_ALL=C
+
+
+for processes in mpich mpich-mpd mpich-shmem ; do
+( 
+  cd debian/${processes}-bin; 
+  for d in usr/lib/${processes}/{bin,sbin,share/upshot/bin,share/examples,examples,examples/MPI-2-C++,etc}; do 
+  (  
+      cd ${d}
+      echo Doing ${d}
+      for x in $(grep -l ${dir} * 2>/dev/null); do
+	  if (file ${x} | grep script ) || \
+		  (file ${x} | grep text ); then 
+	      echo Fixing ${x}
+	      sed -e 's|/image_mpich/../debian/mpich||g' -e 's|/image_mpich-mpd/../debian/mpich-mpd||g' -e 's|'$(echo ${dir})'||g' -e 's|'${HOME}'|${HOME}|g' ${x} > ${x}.new
+	      cp ${x}.new ${x}
+	      rm ${x}.new ;
+	  fi
+      done )
+  done
+) done
+
--- mpich-1.2.7.orig/debian/mpich-bin.links.in
+++ mpich-1.2.7/debian/mpich-bin.links.in
@@ -0,0 +1,18 @@
+etc/#MPICH#/machines.LINUX usr/lib/#MPICH#/share/machines.LINUX
+etc/#MPICH#/machines.LINUX usr/lib/#MPICH#/share/machines.LINUX_ALPHA
+usr/lib/#MPICH#/bin/mpirun usr/bin/mpirun.#MPICH#
+usr/lib/#MPICH#/bin/mpiman usr/bin/mpiman.#MPICH#
+usr/lib/#MPICH#/bin/clog2alog usr/bin/clog2alog.#MPICH#
+usr/lib/#MPICH#/bin/clog_print usr/bin/clog_print.#MPICH#
+usr/lib/#MPICH#/bin/mpichversion usr/bin/mpichversion.#MPICH#
+usr/lib/#MPICH#/sbin/chp4_servs usr/bin/chp4_servs.#MPICH#
+usr/lib/#MPICH#/sbin/cleanipcs usr/bin/cleanipcs.#MPICH#
+usr/lib/#MPICH#/sbin/tstmachines usr/bin/tstmachines.#MPICH#
+usr/lib/#MPICH#/man/man1/mpirun.1.gz usr/share/man/man1/mpirun.#MPICH#.1.gz
+usr/lib/#MPICH#/man/man1/mpiman.1.gz usr/share/man/man1/mpiman.#MPICH#.1.gz
+usr/lib/#MPICH#/man/man1/clog2alog.1.gz usr/share/man/man1/clog2alog.#MPICH#.1.gz
+usr/lib/#MPICH#/man/man1/clog_print.1.gz usr/share/man/man1/clog_print.#MPICH#.1.gz
+usr/lib/#MPICH#/man/man1/mpichversion.1.gz usr/share/man/man1/mpichversion.#MPICH#.1.gz
+usr/lib/#MPICH#/man/man1/chp4_servs.1.gz usr/share/man/man1/chp4_servs.#MPICH#.1.gz
+usr/lib/#MPICH#/man/man1/cleanipcs.1.gz usr/share/man/man1/cleanipcs.#MPICH#.1.gz
+usr/lib/#MPICH#/man/man1/tstmachines.1.gz usr/share/man/man1/tstmachines.#MPICH#.1.gz
--- mpich-1.2.7.orig/debian/mpichversion.1
+++ mpich-1.2.7/debian/mpichversion.1
@@ -0,0 +1,15 @@
+.TH mpichversion 1 "16 Dec 2004" "Debian GNU/Linux" "MPE/MPICH"
+.SH NAME
+mpichversion \- prints information about installed version of mpich
+.SH SYNOPSIS
+.B mpichversion
+
+.SH DESCRIPTION
+.B mpichversion
+Prints version information such as upstream version, configure options, build
+date, etc.
+.SH AUTHOR
+This manpage has been written by Adam Powell <hazelsct@debian.org> for Debian GNU/Linux
+.SH "SEE ALSO"
+mpirun(1), "MPICH user's guide".
+
--- mpich-1.2.7.orig/debian/mpich-bin.postinst.in
+++ mpich-1.2.7/debian/mpich-bin.postinst.in
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+
+set -e
+
+case "$1" in
+   configure)
+      # Continue below
+      ;;
+   abort-upgrade|abort-remove|abort-deconfigure)
+      exit 0;
+      ;;
+   *)
+      echo "postinst called with unknown argument \`$1'" >&2
+      exit 0;
+      ;;
+esac
+
+update-alternatives \
+    --install /usr/bin/mpirun mpirun /usr/bin/mpirun.#MPICH# 10 \
+    --slave /usr/share/man/man1/mpirun.1.gz mpirun.1.gz /usr/share/man/man1/mpirun.#MPICH#.1.gz \
+    --slave /usr/bin/mpiman mpiman /usr/bin/mpiman.#MPICH# \
+    --slave /usr/share/man/man1/mpiman.1.gz mpiman.1.gz /usr/share/man/man1/mpiman.#MPICH#.1.gz \
+    --slave /usr/bin/clog2alog clog2alog /usr/bin/clog2alog.#MPICH# \
+    --slave /usr/share/man/man1/clog2alog.1.gz clog2alog.1.gz /usr/share/man/man1/clog2alog.#MPICH#.1.gz \
+    --slave /usr/bin/clog_print clog_print /usr/bin/clog_print.#MPICH# \
+    --slave /usr/share/man/man1/clog_print.1.gz clog_print.1.gz /usr/share/man/man1/clog_print.#MPICH#.1.gz \
+    --slave /usr/bin/logviewer logviewer /usr/bin/logviewer.#MPICH# \
+    --slave /usr/bin/mpichversion mpichversion /usr/bin/mpichversion.#MPICH# \
+    --slave /usr/share/man/man1/mpichversion.1.gz mpichversion.1.gz /usr/share/man/man1/mpichversion.#MPICH#.1.gz \
+    --slave /usr/bin/chp4_servs chp4_servs /usr/bin/chp4_servs.#MPICH# \
+    --slave /usr/share/man/man1/chp4_servs.1.gz chp4_servs.1.gz /usr/share/man/man1/chp4_servs.#MPICH#.1.gz \
+    --slave /usr/bin/cleanipcs cleanipcs /usr/bin/cleanipcs.#MPICH# \
+    --slave /usr/share/man/man1/cleanipcs.1.gz cleanipcs.1.gz /usr/share/man/man1/cleanipcs.#MPICH#.1.gz \
+    --slave /usr/bin/tstmachines tstmachines /usr/bin/tstmachines.#MPICH# \
+    --slave /usr/share/man/man1/tstmachines.1.gz tstmachines.1.gz /usr/share/man/man1/tstmachines.#MPICH#.1.gz
+
+#DEBHELPER#
--- mpich-1.2.7.orig/debian/machines.LINUX
+++ mpich-1.2.7/debian/machines.LINUX
@@ -0,0 +1 @@
+localhost
--- mpich-1.2.7.orig/debian/patches/09_remove_p4_from_clean_execer_port.dpatch
+++ mpich-1.2.7/debian/patches/09_remove_p4_from_clean_execer_port.dpatch
@@ -0,0 +1,106 @@
+#! /bin/sh -e
+## 09_remove_p4_from_clean_execer_port.dpatch by Adam Powell <hazelsct@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Removes p4 from p4_clean_execer_port symbol name for compatibility
+## DP: between ch_p4 and ch_p4mpd libs (which seem to share p4_error.c).
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+
+
+
+--- mpich-1.2.7.orig/mpid/ch_p4/p4/lib/p4_utils.c
++++ mpich-1.2.7/mpid/ch_p4/p4/lib/p4_utils.c
+@@ -1020,7 +1020,7 @@
+ 
+ #   endif
+ 
+-    p4_clean_execer_port();
++    clean_execer_port();
+ 
+     if (p4_get_my_id())
+         p4_dprintfl(20,"process exiting\n");
+@@ -1402,7 +1402,7 @@
+ 
+     return(port);
+ }
+-void p4_clean_execer_port( void )
++void clean_execer_port( void )
+ {
+     char job_filename[64];
+     if (execer_starting_remotes  &&  execer_mynodenum == 0)
+@@ -1434,7 +1434,7 @@
+     if (close(fd) < 0)
+         p4_error("put_execer_port: close", errno);
+ }
+-void p4_clean_execer_port(void)
++void clean_execer_port(void)
+ {
+ }
+ #endif
+--- mpich-1.2.7.orig/mpid/ch_p4/p4/lib/p4_error.c
++++ mpich-1.2.7/mpid/ch_p4/p4/lib/p4_error.c
+@@ -176,7 +176,7 @@
+       BNR_Kill( mygroup );
+     }
+ #endif
+-    p4_clean_execer_port();
++    clean_execer_port();
+ 
+     if (interrupt_caught && value != SIGINT)
+     {
+--- mpich-1.2.7.orig/mpid/ch_p4/p4/lib/p4_sys_funcs.h
++++ mpich-1.2.7/mpid/ch_p4/p4/lib/p4_sys_funcs.h
+@@ -41,7 +41,7 @@
+ /* P4VOID exec_pgm ( ); */
+ P4VOID put_execer_port (int);
+ int get_execer_port (char *);
+-void p4_clean_execer_port( void );
++void clean_execer_port( void );
+ int fork_p4 (void);
+ P4VOID free_p4_msg (struct p4_msg *);
+ P4VOID free_quel (struct p4_queued_msg *);
+--- mpich-1.2.7.orig/mpid/ch_p4/p4/lib/p4_sock_conn.c	2005-01-05 15:48:07.000000000 -0500
++++ mpich-1.2.7/mpid/ch_p4/p4/lib/p4_sock_conn.c	2005-07-12 14:45:58.514459640 -0400
+@@ -704,7 +704,7 @@
+ #	if defined(SGI)  &&  defined(VENDOR_IPC)
+ 	unlink(p4_sgi_shared_arena_filename);
+ #	endif
+-	p4_clean_execer_port();
++	clean_execer_port();
+ 	exit(0);
+     }
+ 
+--- mpich-1.2.7.orig/mpid/ch_p4mpd/p4mpd/lib/p4_utils.c	2004-06-28 18:13:07.000000000 -0400
++++ mpich-1.2.7/mpid/ch_p4mpd/p4mpd/lib/p4_utils.c	2005-07-12 15:53:24.487378264 -0400
+@@ -1077,7 +1077,7 @@
+ 
+     return(port);
+ }
+-void p4_clean_execer_port( void )
++void clean_execer_port( void )
+ {
+     char job_filename[64];
+     if (execer_starting_remotes  &&  execer_mynodenum == 0)
+@@ -1091,7 +1091,7 @@
+ void put_execer_port( int port )
+ {
+ }
+-void p4_clean_execer_port( void )
++void clean_execer_port( void )
+ {
+ }
+ #endif
--- mpich-1.2.7.orig/debian/patches/02_mpeshlibs.dpatch
+++ mpich-1.2.7/debian/patches/02_mpeshlibs.dpatch
@@ -0,0 +1,74 @@
+#! /bin/sh -e
+## 02_makeshlibs.dpatch by Junichi Uekawa <dancer@debian.org>
+## (original made by some of the former maintainers)
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds shlibs support for MPE.
+## DP: upstream refused to apply.
+## DP: Modified by Adam Powell to add --with-sloglibname to configure options
+## DP: for 1.2.5-4 built May 19, 2003; moved that material from the .diff.gz
+## DP: to this patch (and 01_destdir) October 7, 2003 for 1.2.5.2-1.
+## DP: Big changes in forward-port to 1.2.5.3 October 26, 2004 (Adam Powell).
+## DP: Removed slog in forward-port to 1.2.7 July 12, 2005 (Adam Powell).
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+
+
+--- mpich-1.2.7.orig/mpe/src/Makefile.in
++++ mpich-1.2.7/mpe/src/Makefile.in
+@@ -93,8 +93,7 @@
+ 
+ # Allow compilers that do not allow -o for renaming object files
+ .c.lo:
+-	$(CC_SHL) $(CFLAGS) -c $< $(INC_DIR)
+-	@mv $*.@OBJEXT@ $*.lo
++	$(MPI_CC) $(CFLAGS) -fPIC -c $< -o $@
+ 
+ # default_all is the same as default, but without the RANLIB.  This
+ # can speed up the build (ranlibs can take a LONG time).  profile_all 
+@@ -113,6 +112,7 @@
+ 	 $(MAKE) libslog.a 
+ 	 sleep 1
+ 	 $(MAKE) ${libbuild_dir}/lib$(PROF_LIBNAME).a 
++	 $(MAKE) ${libbuild_dir}/shared/lib$(PROF_LIBNAME).so
+ 	 $(MAKE) ${libbuild_dir}/lib$(TRACE_LIBNAME).a 
+ 	 $(MAKE) ${libbuild_dir}/lib$(LOG_LIBNAME).a 
+ 	@if [ -n "$(MPE_GRAPHICS)" ] ; then \
+@@ -171,11 +171,10 @@
+ # Building a shared library requires different tools on different systems.
+ # The following will work *ONLY* for gcc.  Eventually, this should invoke
+ # the approriate command to handle other shared libraries on other systems.
+-${libbuild_dir}/lib$(PROF_LIBNAME).so: $(MPE_SHLOBJECTS)
+-	if [ "@SHAREDKIND@" = "gcc" ] ; then \
+-	$(CLINKER) -shared -Wl,-soname,lib$(PROF_LIBNAME).so.1.0 -Wl,-rpath,$(libdir) -o $@.1.0 $(MPE_SHLOBJECTS) -L /usr/X11R6/lib -lX11 -L ../slog_api/lib -lslog -lm ; \
+-	ln -sf lib$(PROF_LIBNAME).so.1.0 ${libbuild_dir}/lib$(PROF_LIBNAME).so ; \
+-	fi
++${libbuild_dir}/shared/lib$(PROF_LIBNAME).so: $(MPE_SHLOBJECTS)
++	if [ ! -d ${libbuild_dir}/shared ]; then mkdir ${libbuild_dir}/shared; fi
++	$(CLINKER) -shared -Wl,-soname,lib$(PROF_LIBNAME).so.1.0 -o $@.1.0 $(MPE_SHLOBJECTS) -L /usr/X11R6/lib -lX11 -lm
++	ln -sf lib$(PROF_LIBNAME).so.1.0 ${libbuild_dir}/shared/lib$(PROF_LIBNAME).so
+ 
+ ${libbuild_dir}/lib$(PROF_LIBNAME)_nompi.a:  $(MPEGRAPHICS_SOURCE)
+ 	@if [ "$(MPEGRAPHICS_SOURCE)" != "" ] ; then \
+@@ -288,7 +287,7 @@
+ 	    ( cd ../slog_api ; $(MAKE) rmlib ) \
+ 	fi
+ 	$(RM) -f ${libbuild_dir}/lib$(PROF_LIBNAME).a 
+-	$(RM) -f ${libbuild_dir}/lib$(PROF_LIBNAME).so 
++	$(RM) -f ${libbuild_dir}/shared/lib$(PROF_LIBNAME).so 
+ 	$(RM) -f ${libbuild_dir}/lib$(TRACE_LIBNAME).a 
+ 	$(RM) -f ${libbuild_dir}/lib$(LOG_LIBNAME).a 
+ 	$(RM) -f ${libbuild_dir}/lib$(ANIM_LIBNAME).a 
--- mpich-1.2.7.orig/debian/patches/15_shared_c++.dpatch
+++ mpich-1.2.7/debian/patches/15_shared_c++.dpatch
@@ -0,0 +1,42 @@
+#! /bin/sh -e
+## 15_shared_c++.dpatch by Adam Powell <hazelsct@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Create shared libmpich++ with -fPIC, first in 1.2.5.3-2.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+
+
+--- mpich-1.2.7.orig/Makefile.in	2004-04-20 12:05:48.000000000 -0400
++++ mpich-1.2.7/Makefile.in	2004-12-10 15:58:20.000000000 -0500
+@@ -193,7 +193,7 @@
+ 	@-( cd $(libbuild_dir) && \
+ 	CC="$(CC)" ; export CC ; CLINKER="@CLINKER@" ; export CLINKER ; \
+ 	for lib in lib${MPILIBNAME}.a libp${MPILIBNAME}.a \
+-            lib${FMPILIBNAME}.a ; do \
++            lib${FMPILIBNAME}.a libp${MPILIBNAME}++.a ; do \
+ 	    if [ -s $$lib ] ; then \
+ 	      ${top_srcdir}/util/makesharedlib -exceptobjs="farg.o farg90.o initf.o" -lib=$$lib -kind=@SHAREDKIND@ ; \
+ 	    fi ; \
+@@ -344,7 +344,7 @@
+ 	fi
+ 	@(cd ${CPP_DIR} && MAKE="$(MAKE)" ; export MAKE ; \
+ 	rm -f config.cache ; \
+-	CXXFLAGS="" ; export CXXFLAGS ; \
++	CXXFLAGS="-fPIC" ; export CXXFLAGS ; \
+ 	CXX="g++" ; export CXX ; \
+ 	CC="@CC@" ; export CC ; \
+ 	ldir=`echo $(libdir) | sed -e 's%$(MPIR_HOME)/%%g'` ; \
--- mpich-1.2.7.orig/debian/patches/17_mpd_rm_extern_arrays.dpatch
+++ mpich-1.2.7/debian/patches/17_mpd_rm_extern_arrays.dpatch
@@ -0,0 +1,66 @@
+#! /bin/sh -e
+## 17_mpd_rm_extern_arrays.dpatch by Andreas Jochens <aj@andaco.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove extern arrays from mpd, first in 1.2.5.3-5.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+
+
+--- mpich-1.2.7.orig/mpid/mpd/handlers.c       2002-01-18 19:02:15.000000000 +0100
++++ mpich-1.2.7/mpid/mpd/handlers.c       2005-03-09 13:10:51.458923086 +0100
+@@ -24,8 +24,6 @@
+ extern int    rhs_idx;
+ extern int    lhs_idx;
+ extern int    mon_idx;
+-extern struct keyval_pairs keyval_tab[64];
+-extern int    keyval_tab_idx;
+ extern char   mpd_passwd[PASSWDLEN];
+ extern int    pulse_chkr;
+ extern int    shutting_down;
+--- mpich-1.2.7.orig/mpid/mpd/mpd.c    2002-01-19 19:29:57.000000000 +0100
++++ mpich-1.2.7/mpid/mpd/mpd.c    2005-03-09 13:10:13.236733742 +0100
+@@ -82,9 +82,6 @@
+ /* jobid data */
+ int first_avail, last_avail, first_pool, last_pool;
+ 
+-extern struct keyval_pairs keyval_tab[64];
+-extern int keyval_tab_idx;
+-
+ int main( int argc, char *argv[] )
+ {
+     int  i, allow_console, rc, num_fds;
+--- mpich-1.2.7.orig/mpid/mpd/sibproc.c        2003-03-18 17:21:54.000000000 +0100
++++ mpich-1.2.7/mpid/mpd/sibproc.c        2005-03-09 13:10:30.468114174 +0100
+@@ -35,8 +35,6 @@
+ extern int    lhsport;
+ extern int    debug;
+ extern int    allexiting;
+-extern struct keyval_pairs keyval_tab[64];
+-extern int    keyval_tab_idx;
+ extern char   mpd_passwd[PASSWDLEN];
+ extern int    no_execute;
+ extern int    shutting_down;
+--- mpich-1.2.7.orig/mpid/mpd/sockets.c        2002-01-18 19:02:18.000000000 +0100
++++ mpich-1.2.7/mpid/mpd/sockets.c        2005-03-09 12:48:39.402426454 +0100
+@@ -1,6 +1,6 @@
+ #include "mpd.h"
+ 
+-extern struct portentry porttable[MAXFDENTRIES];
++extern struct portentry *porttable;
+ extern int    myrank;	
+ extern int    console_idx;
+ extern int    debug;
--- mpich-1.2.7.orig/debian/patches/04_hackg2c.dpatch
+++ mpich-1.2.7/debian/patches/04_hackg2c.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh -e
+## 04_hackg2c.dpatch by Junichi Uekawa <dancer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Hack to link libg2c to libpmpich
+## DP: not sent upstream yet.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+       -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+       -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+	*)
+		echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+		exit 1;;
+esac
+
+exit 0
+				    
+diff -urNad 04.tmp/util/makesharedlib 04/util/makesharedlib
+--- 04.tmp/util/makesharedlib	2002-12-21 03:26:04.000000000 +0900
++++ 04/util/makesharedlib	2003-01-13 19:05:33.000000000 +0900
+@@ -149,7 +149,7 @@
+     # Include any other libraries needed to link with in case they are
+     # needed to resolve any symbols.  This is needed for Scyld and should
+     # be harmless in general.
+-    OtherLibs="$BASE_LIB_LIST"
++    OtherLibs="$BASE_LIB_LIST -lg2c "
+     for libname in $SHLIBS ; do
+         $Verbose "Making a shared library of $libname"
+         rm -rf .tmp
--- mpich-1.2.7.orig/debian/patches/08_mpih_include_mpidefs.dpatch
+++ mpich-1.2.7/debian/patches/08_mpih_include_mpidefs.dpatch
@@ -0,0 +1,55 @@
+#! /bin/sh -e
+## 05_mpih_include_mpidefs.dpatch by Adam Powell <hazelsct@debian.org>
+## (original made by some of the former maintainers)
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Move #include "mpidefs.h" to its proper place in mpi.h
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+--- mpich-1.2.5.3.orig/include/mpi.h	2003-01-10 10:55:40.000000000 -0500
++++ mpich-1.2.5.3/include/mpi.h	2003-10-07 10:00:39.000000000 -0400
+@@ -167,15 +167,6 @@
+ #define MPI_ROOT        (-3)
+ #define MPI_ANY_TAG     (-1)
+ 
+-/* MPI Error handlers.  Systems that don't support stdargs can't use
+-   this definition
+- */
+-#if defined(USE_STDARG) 
+-typedef void (MPI_Handler_function) ( MPI_Comm *, int *, ... );
+-#else
+-typedef void (MPI_Handler_function) ();
+-#endif
+-
+ #define MPI_ERRORS_ARE_FATAL ((MPI_Errhandler)119)
+ #define MPI_ERRORS_RETURN    ((MPI_Errhandler)120)
+ #define MPIR_ERRORS_WARN     ((MPI_Errhandler)121)
+@@ -238,6 +229,15 @@
+    It now includes the definition of MPI_Status */
+ #include "mpidefs.h"
+ 
++/* MPI Error handlers.  Systems that don't support stdargs can't use
++   this definition
++ */
++#if defined(USE_STDARG) 
++typedef void (MPI_Handler_function) ( MPI_Comm *, int *, ... );
++#else
++typedef void (MPI_Handler_function) ();
++#endif
++
+ /* Handle conversion types/functions */
+ 
+ /* Programs that need to convert types used in MPICH should use these */
--- mpich-1.2.7.orig/debian/patches/03_move_logfile.dpatch
+++ mpich-1.2.7/debian/patches/03_move_logfile.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh -e
+## 03_move_logfile.dpatch by Junichi Uekawa <dancer@debian.org>
+## (original made by some of the former maintainers)
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Moves log file to standard location.
+## DP: debian specific
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+
+
+
+--- mpich-1.2.7.orig/mpid/server/serv_p4.c
++++ mpich-1.2.7/mpid/server/serv_p4.c
+@@ -145,7 +145,7 @@
+ #define MAXARGS 256
+ 
+ #ifndef LOGFILE
+-#define LOGFILE "/usr/adm/secure_server.log"
++#define LOGFILE "/var/log/secure_server.log"
+ #endif
+ char logfile[1024];
+ FILE *logfile_fp;
--- mpich-1.2.7.orig/debian/patches/11_romio_index.dpatch
+++ mpich-1.2.7/debian/patches/11_romio_index.dpatch
@@ -0,0 +1,58 @@
+#! /bin/sh -e
+## 11_mpio_index.dpatch by Adam Powell <hazelsct@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Just here to avoid tons of warnings when building with gcc 3.3+.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+
+
+--- mpich-1.2.5.3.orig/romio/include/mpio.h.in
++++ mpich-1.2.5.3/romio/include/mpio.h.in
+@@ -253,12 +253,14 @@
+ /* The foll. functions are required, because an MPIO_Request object
+    is currently used for nonblocking I/O. These functions will go away
+    after generalized requests are implemented. */
++/* Third argument to Testany and Waitany is index, removed to avoid warnings
++   for the Debian package by Adam Powell 11/3/2004. */
+ int MPIO_Test(MPIO_Request *request, int *flag, MPI_Status *status);
+ int MPIO_Wait(MPIO_Request *request, MPI_Status *status);
+ int MPIO_Testall(int count, MPIO_Request *request, int *flag, MPI_Status *status);
+ int MPIO_Waitall(int count, MPIO_Request *request, MPI_Status *status);
+-int MPIO_Testany(int count, MPIO_Request *request, int *index, int *flag, MPI_Status *status);
+-int MPIO_Waitany(int count, MPIO_Request *request, int *index, MPI_Status *status);
++int MPIO_Testany(int count, MPIO_Request *request, int *, int *flag, MPI_Status *status);
++int MPIO_Waitany(int count, MPIO_Request *request, int *, MPI_Status *status);
+ int MPIO_Waitsome(int, MPIO_Request *, int *, int *, MPI_Status *);
+ int MPIO_Testsome(int, MPIO_Request *, int *, int *, MPI_Status *);
+ 
+@@ -422,12 +424,14 @@
+ /* The foll. functions are required, because an MPIO_Request object
+    is currently used for nonblocking I/O. These functions will go away
+    after generalized requests are implemented. */
++/* Third argument to Testany and Waitany is index, removed to avoid warnings
++   for the Debian package by Adam Powell 11/3/2004. */
+ int PMPIO_Test(MPIO_Request *request, int *flag, MPI_Status *status);
+ int PMPIO_Wait(MPIO_Request *request, MPI_Status *status);
+ int PMPIO_Testall(int count, MPIO_Request *request, int *flag, MPI_Status *status);
+ int PMPIO_Waitall(int count, MPIO_Request *request, MPI_Status *status);
+-int PMPIO_Testany(int count, MPIO_Request *request, int *index, int *flag, MPI_Status *status);
+-int PMPIO_Waitany(int count, MPIO_Request *request, int *index, MPI_Status *status);
++int PMPIO_Testany(int count, MPIO_Request *request, int *, int *flag, MPI_Status *status);
++int PMPIO_Waitany(int count, MPIO_Request *request, int *, MPI_Status *status);
+ int PMPIO_Waitsome(int, MPIO_Request *, int *, int *, MPI_Status *);
+ int PMPIO_Testsome(int, MPIO_Request *, int *, int *, MPI_Status *);
+ MPI_Fint PMPIO_Request_c2f(MPIO_Request request);
--- mpich-1.2.7.orig/debian/patches/21_hurd_support.dpatch
+++ mpich-1.2.7/debian/patches/21_hurd_support.dpatch
@@ -0,0 +1,137 @@
+#! /bin/sh -e
+## 21_hurd_support.dpatch by Samuel Thibault <samuel.thibault@ens-lyon.org>
+## merged by Adam Powell <hazelsct@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Support for Hurd, first in 1.2.7-3.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+
+
+--- mpich-1.2.7.orig/bin/tarch.orig	2007-04-21 20:52:55.000000000 +0000
++++ mpich-1.2.7/bin/tarch	2007-04-21 20:31:01.000000000 +0000
+@@ -69,7 +69,7 @@
+ 
+ 	IRIX64|IRIX) FARCH=$LARCH ; break ;;
+  
+-        Linux)  
++        Linux|GNU)  
+ 	    # Pick between i86, alpha, and PowerPC LINUX
+             LINUXARCH=`$UNAME -m`
+ 	    case $LINUXARCH in 
+--- mpich-1.2.7.orig/mpid/mpd/mpdcon.c.orig	2007-04-21 20:54:51.000000000 +0000
++++ mpich-1.2.7/mpid/mpd/mpdcon.c	2007-04-21 20:54:11.000000000 +0000
+@@ -15,6 +15,10 @@
+ #define PATSIZE 64
+ #define TIMEOUTVAL 5
+ 
++#ifndef MAXPATHLEN
++#define MAXPATHLEN 1024
++#endif
++
+ struct fdentry fdtable[MAXFDENTRIES];  /* for external defn */
+ extern int fdtable_high_water_mark;
+ 
+--- mpich-1.2.7.orig/mpid/ch_shmem/configure.in.orig	2007-04-21 21:50:19.000000000 +0000
++++ mpich-1.2.7/mpid/ch_shmem/configure.in	2007-04-21 21:52:09.000000000 +0000
+@@ -134,6 +134,7 @@
+ # where they belong).  Thus, if mutex_init IS found, we need to 
+ # check for -lthread.   (Which we should have done above)
+ #
++AC_CHECK_LIB(pthread,sem_post)
+ AC_CHECK_FUNCS(mutex_init strerror shmat semop mmap sem_post)
+ 
+ # atexit registers a function to be called at normal process termination
+--- mpich-1.2.7.orig/mpid/ch_shmem/configure.orig	2007-04-21 21:53:03.000000000 +0000
++++ mpich-1.2.7/mpid/ch_shmem/configure	2007-04-21 22:28:33.000000000 +0000
+@@ -1316,6 +1316,53 @@
+ # where they belong).  Thus, if mutex_init IS found, we need to 
+ # check for -lthread.   (Which we should have done above)
+ #
++echo $ac_n "checking for sem_post in -lpthread""... $ac_c" 1>&1
++echo "configure:1272: checking for sem_post in -lpthread" >&2
++ac_lib_var=`echo pthread'_'sem_post | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&1
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-lpthread  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 1280 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char sem_post();
++
++int main() {
++sem_post()
++; return 0; }
++EOF
++if { (eval echo configure:1291: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&2
++  cat conftest.$ac_ext >&2
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&1
++    ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_lib 1
++EOF
++
++  LIBS="-lpthread $LIBS"
++
++else
++  echo "$ac_t""no" 1>&1
++fi
++
+ for ac_func in mutex_init strerror shmat semop mmap sem_post
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&1
+--- mpich-1.2.7.orig/mpid/ch_shmem/p2p_locks.h.orig	2007-04-21 22:31:04.000000000 +0000
++++ mpich-1.2.7/mpid/ch_shmem/p2p_locks.h	2007-04-21 22:46:33.000000000 +0000
+@@ -226,16 +226,16 @@
+ #endif
+ 
+ #if defined(USE_POSIX_SEM)
+-#include <?>
++#include <semaphore.h>
+ #define INCLUDED_POSIX_SEM
+ typedef struct { sem_t mutex; } p2p_lock_t;
+-#define p2p_lock_init(l) sem_init( &((l).mutex), 0, 1 )
++#define p2p_lock_init(l) sem_init( &((l)->mutex), 0, 1 )
+ /* Sem_wait is a slow system call and can be interrupted */
+ #define p2p_lock(l)      \
+-    while (sem_wait( &((l).mutex) == -1 && errno == EAGAIN );
+-#define p2p_unlock(l)    sem_post( &((l).mutex) )
++    ({ while (sem_wait( &((l)->mutex) ) == -1 && (errno == EAGAIN || errno == EINTR) ); 0; })
++#define p2p_unlock(l)    sem_post( &((l)->mutex) )
+ #define p2p_lock_name    "Posix sem"
+-#define p2p_lock_free(l) sem_destroy( &((l).mutex )
++#define p2p_lock_free(l) sem_destroy( &((l)->mutex )
+ #endif
+ 
+ /* A few odds and ends */
--- mpich-1.2.7.orig/debian/patches/18_link_against_needed_libs.dpatch
+++ mpich-1.2.7/debian/patches/18_link_against_needed_libs.dpatch
@@ -0,0 +1,106 @@
+#! /bin/sh -e
+## 18_link_against_needed_libs.dpatch by Adeodato Simó <asp16@alu.ua.es>
+## Modified by Kumar Appaiah <akumar@ee.iitm.ac.in> for -6 to support gfortran
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make sure all shipped shared libraries are linked against all libraries
+## DP: they use symbols from. See debian/changelog 1.2.5.3-6.1 for explanations.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+
+
+--- a/util/makesharedlib
++++ b/util/makesharedlib
+@@ -149,7 +149,7 @@
+     # Include any other libraries needed to link with in case they are
+     # needed to resolve any symbols.  This is needed for Scyld and should
+     # be harmless in general.
+-    OtherLibs="$BASE_LIB_LIST -lg2c "
++    OtherLibs="$BASE_LIB_LIST $EXTRA_LIBS "
+     for libname in $SHLIBS ; do
+         $Verbose "Making a shared library of $libname"
+         rm -rf .tmp
+@@ -170,7 +170,10 @@
+         libbase=`basename $libname .a`
+ 	# The -h name sets the name of the object; this is necessary to 
+ 	# ensure that the dynamic linker can find the proper shared library.
++        export F77_GETARGDECL="intrinsic GETARG"
+         if $CLINKER -shared -Wl,-h,$libbase.$slsuffix -o ../shared/$libbase.$slsuffix *.o $OtherLibs ; then
++          echo Successfully linked $libname
++        elif gfortran -shared -Wl,-h,$libbase.$slsuffix -o ../shared/$libbase.$slsuffix *.o $OtherLibs ; then
+ 	    echo Successfully linked $libname
+ 	else
+ 	    echo "Linking $libname shared lib failed " 
+@@ -189,7 +192,7 @@
+   	    if [ $slsuffix != $req_slsuffix -a $nolink = 0 ] ; then
+ 	        rm -f shared/$libbase.$req_slsuffix
+ 	        (cd shared ; \
+-                 ln -s ../$libbase.$slsuffix $libbase.$req_slsuffix )
++                 ln -s $libbase.$slsuffix $libbase.$req_slsuffix )
+             fi
+ 	fi
+         rm -rf .tmp
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -134,9 +134,9 @@
+ 
+ # Use this target for add-on features
+ mpi-addons:
+-	$(MAKE) mpelib        
+-	-@if [ "@SHAREDKIND@" != "ignore" ] ; then \
++	@if [ "@SHAREDKIND@" != "ignore" ] ; then \
+ 	$(MAKE) mpichsharelibs ; fi
++	$(MAKE) mpelib        
+ 
+ # This target is for various utilities (mpirun, servers)
+ # Note that ch_p4 now invokes the device-dependent mpirun_setup script
+@@ -189,14 +189,22 @@
+ # The test on the filenames below simply prevents error messages
+ # when using these tests.
+ mpichsharelibs:
+-	@-( cd $(libbuild_dir) && \
++	@( set -e; cd $(libbuild_dir) && \
+ 	CC="$(CC)" ; export CC ; CLINKER="@CLINKER@" ; export CLINKER ; \
+-	for lib in lib${MPILIBNAME}.a libp${MPILIBNAME}.a \
+-            lib${FMPILIBNAME}.a libp${MPILIBNAME}++.a ; do \
++	for lib in lib${MPILIBNAME}.a libp${MPILIBNAME}.a; do \
+ 	    if [ -s $$lib ] ; then \
++	      env EXTRA_LIBS="-Wl,-z,defs" \
+ 	      ${top_srcdir}/util/makesharedlib -lib=$$lib -kind=@SHAREDKIND@ ; \
+ 	    fi ; \
+ 	done ; \
++	lib=lib${FMPILIBNAME}.a ; if [ -s $$lib ] ; then \
++	    env EXTRA_LIBS="-Wl,-z,defs -L../shared -l${MPILIBNAME}" \
++	    ${top_srcdir}/util/makesharedlib -lib=$$lib -kind=@SHAREDKIND@ ; \
++	fi ; \
++	lib=libp${MPILIBNAME}++.a ; if [ -s $$lib ] ; then \
++	    env EXTRA_LIBS="-Wl,-z,defs -lstdc++ -L../shared -l${MPILIBNAME}" \
++	    ${top_srcdir}/util/makesharedlib -lib=$$lib -kind=@SHAREDKIND@ ; \
++	fi ; \
+         if [ $(NOF77) = 0 ] ; then \
+ 	    if [ "@FLIBNAME@" != "@MPILIBNAME@" ] ; then \
+ 	      ${top_srcdir}/util/makesharedlib -lib=lib@FLIBNAME@.a -kind=@SHAREDKIND@ ; \
+--- a/mpe/src/Makefile.in
++++ b/mpe/src/Makefile.in
+@@ -173,7 +173,7 @@
+ # the approriate command to handle other shared libraries on other systems.
+ ${libbuild_dir}/shared/lib$(PROF_LIBNAME).so: $(MPE_SHLOBJECTS)
+ 	if [ ! -d ${libbuild_dir}/shared ]; then mkdir ${libbuild_dir}/shared; fi
+-	$(CLINKER) -shared -Wl,-soname,lib$(PROF_LIBNAME).so.1.0 -o $@.1.0 $(MPE_SHLOBJECTS) -L /usr/X11R6/lib -lX11 -lm
++	$(CLINKER) -shared -Wl,-z,defs -Wl,-soname,lib$(PROF_LIBNAME).so.1.0 -o $@.1.0 $(MPE_SHLOBJECTS) -L /usr/X11R6/lib -lX11 -lm -L../../lib/shared -l`echo $(PROF_LIBNAME) | sed -e 's/^mpe/mpich/'`
+ 	ln -sf lib$(PROF_LIBNAME).so.1.0 ${libbuild_dir}/shared/lib$(PROF_LIBNAME).so
+ 
+ ${libbuild_dir}/lib$(PROF_LIBNAME)_nompi.a:  $(MPEGRAPHICS_SOURCE)
--- mpich-1.2.7.orig/debian/patches/19_kfreebsd.dpatch
+++ mpich-1.2.7/debian/patches/19_kfreebsd.dpatch
@@ -0,0 +1,42 @@
+#! /bin/sh -e
+## 19_kfreebsd.dpatch by Aurelien Janro <aurel32@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add support for GNU/kFreeBSD
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+--- mpich-1.2.7.orig/bin/tarch
++++ mpich-1.2.7/bin/tarch
+@@ -138,6 +138,7 @@
+         next)            FARCH=NeXT ; break ;;	
+ 	KSR1|KSR2)       FARCH=ksr ; break ;;	
+         FreeBSD)         FARCH=freebsd ; break ;;
++        GNU/kFreeBSD)         FARCH=freebsd ; break ;;
+ 	NetBSD)          FARCH=netbsd ; break ;;
+ 	i386)            GARCH=ipsc2 ;;
+ 	ULTRIX|RISC)     GARCH=dec5000 ;;
+
+--- mpich-1.2.7.orig/mpid/ch_p4/p4/lib/p4_secure.c
++++ mpich-1.2.7/mpid/ch_p4/p4/lib/p4_secure.c
+@@ -367,6 +367,7 @@
+ #if defined(P4BSD) && !defined(NO_ECHO)
+ 
+ #ifdef FREEBSD
++#include <sys/ioctl.h>
+ #include <sys/ioctl_compat.h>
+ #else
+ #include <sys/ioctl.h>
+
--- mpich-1.2.7.orig/debian/patches/05_tvshlib.dpatch
+++ mpich-1.2.7/debian/patches/05_tvshlib.dpatch
@@ -0,0 +1,128 @@
+#! /bin/sh -e
+## 05_tvshlib.dpatch by Adam Powell <hazelsct@debian.org>
+## (original made by some of the former maintainers)
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build libtvmpich shlib from objects made using -fPIC.
+## DP: Modified for 1.2.5.3-2 to make the name depend on transport.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+--- mpich-1.2.7.orig/src/env/Makefile.in	2004-04-20 12:05:56.000000000 -0400
++++ mpich-1.2.7/src/env/Makefile.in	2004-12-15 15:09:46.000000000 -0500
+@@ -114,7 +114,7 @@
+ msgqdllloc.o: ${top_srcdir}/src/env/msgqdllloc.c
+ 	@if test -n "@SHAREDKIND_FOR_TV@" -a "@SHAREDKIND_FOR_TV@" != "ignore" ; then \
+ 	  ${CC} ${DEFS} ${CFLAGS} -c @CC_SHARED_OPT_FOR_TV@ \
+-	  -DMPICH_INFODLL_LOC='"@libdir@/libtvmpich.so"' ${top_srcdir}/src/env/msgqdllloc.c ; \
++	  -DMPICH_INFODLL_LOC='"@libdir@/libtv@MPILIBNAME@.so"' ${top_srcdir}/src/env/msgqdllloc.c ; \
+ 	else \
+ 	    ${CC} ${DEFS} ${CFLAGS} -c ${top_srcdir}/src/env/msgqdllloc.c ; \
+ 	fi
+--- mpich-1.2.7.orig/src/infoexport/Makefile.in	2004-07-26 15:14:16.000000000 -0400
++++ mpich-1.2.7/src/infoexport/Makefile.in	2005-07-12 13:47:17.972663344 -0400
+@@ -1,5 +1,6 @@
+ # Make file for the MPI DLL
+ CC          = @CC@
++CLINKER     = @CLINKER@
+ prefix      = @prefix@
+ top_srcdir  = @top_srcdir@
+ srcdir      = @srcdir@
+@@ -14,11 +15,11 @@
+ SHELL       = /bin/sh
+ 
+ .SUFFIXES:
+-.SUFFIXES: .o .c .f
++.SUFFIXES: .o .lo .c .f
+ 
+ 
+ # Target library
+-LIB = libtvmpich.so.1.0
++LIB = libtv@MPILIBNAME@.so.1.0
+ 
+ #
+ # The rules for regenerating things
+@@ -25,6 +26,8 @@
+ #
+ .c.o:
+ 	-${CC} ${DEFS} ${CFLAGS} ${INCLUDES} -c $<
++.c.lo:
++	${CC} ${DEFS} ${CFLAGS} ${INCLUDES} -fPIC -c $< -o $@
+ 
+ # Compilers and flags
+ 
+@@ -70,14 +73,11 @@
+ # However, note that the interface advertises libtvmpich.so as the name,
+ # so we make sure that there is a link for that here (the ln -f steps)
+ #${LIB}: ${OBJS}
+-libtvmpich.so.1.0: dll_mpich.o
++libtv@MPILIBNAME@.so.1.0: dll_mpich.lo
+ 	-if test "@SHAREDKIND_FOR_TV@" != "ignore" ; then \
+ 	${REMOVER} ${LIB}; \
+-	( CC="${CC}" ; export CC ; CLINKER="@CLINKER@" ; export CLINKER ; \
+-	${top_srcdir}/util/makesharedlib -lib=libtvmpich.a -obj="${OBJS}" \
+-		 -kind=@SHAREDKIND_FOR_TV@ -local ; ) ; fi
+-	-ln -s -f libtvmpich.so.1.0 libtvmpich.so.1
+-	-ln -s -f libtvmpich.so.1   libtvmpich.so
++	$(CLINKER) -shared -Wl,-soname,$@ -o $@ $< ; \
++	fi
+ 
+ compile: ${OBJS}
+ 
+@@ -114,7 +114,7 @@
+ 	-${REMOVER} *.cxx.log
+ 	-${REMOVER} *.cxx.errors
+ 	-${REMOVER} ${LIB}
+-	-${REMOVER} libtvmpich.so*
++	-${REMOVER} libtv@MPILIBNAME@.so*
+ 	-${REMOVER} ${srcdir}/*.o
+ 
+ rebuild: clean ${LIB}
+--- mpich-1.2.7.orig/util/mpiinstall.in	2004-04-16 17:45:34.000000000 -0400
++++ mpich-1.2.7/util/mpiinstall.in	2004-12-15 22:50:28.000000000 -0500
+@@ -785,10 +785,10 @@
+ # shared library versioning.  This is the same as the step that installs 
+ # the shared libraries
+ # 
+-# Problem: Installation sometimes builds libtvmpich.so and libtvmpich.so.1.0
++# Problem: Installation sometimes builds libtv@MPILIBNAME@.so and libtv@MPILIBNAME@.so.1.0
+ # as files, causing problems when installing.  
+ # 
+-for file in $libbuild_dir/libtvmpich.so* ; do
++for file in $libbuild_dir/libtv@MPILIBNAME@.so* ; do
+     # Also need to handle any links!
+     if [ ! -h $file -a -f $file ] ; then 
+         CopyFileP $file $libdir $XMODE
+@@ -797,7 +797,7 @@
+ # Get the current directory (see pushd/popd comments in shared lib code)
+ curdir="`pwd`"
+ # Create links from foo.so.n.m to foo.so.n and foo.so.n to foo.so
+-for file in $DESTDIR$libdir/libtvmpich.so* ; do
++for file in $DESTDIR$libdir/libtv@MPILIBNAME@.so* ; do
+     # pushd would be cleaner, but not all systems support it (e.g.,IRIX)
+     #pushd $sharedlib_dir >/dev/null
+     cd $DESTDIR$libdir >/dev/null
+@@ -810,9 +810,9 @@
+ 	     # some information on the failure
+              if [ $? != 0 ] ; then
+                   echo "Error in setting link.  Files in libdir are:"
+-	          ls -l $libdir/libtvmpich.*
++	          ls -l $libdir/libtv@MPILIBNAME@.*
+ 		  echo "Files in source dir are"
+-		  ls -l $libbuild_dir/libtvmpich.so*
++		  ls -l $libbuild_dir/libtv@MPILIBNAME@.so*
+              fi
+ 	     echo "rm -f $libdir/$filebase" >>$UNINSTALLFILE
+ 	 fi
--- mpich-1.2.7.orig/debian/patches/22_gfortran.dpatch
+++ mpich-1.2.7/debian/patches/22_gfortran.dpatch
@@ -0,0 +1,84 @@
+#! /bin/sh -e
+## 22_gfortran.dpatch by Kumar Appaiah <akumar@ee.iitm.ac.in>
+## merged by Adam Powell <hazelsct@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Support for gfortran avoiding the GETARG problem
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+
+
+--- mpich-1.2.7/src/fortran/configure
++++ mpich-1.2.7/src/fortran/configure
+@@ -15820,11 +15820,11 @@
+ 	    # turn off f90
+ 	    F90=""
+ 	else
+- 	    F90_MODINCFLAG="`$MAKE -f ../../f90modules/Makefile f90modflag`"
+-  	    F90MODINCSPEC="`$MAKE -f ../../f90modules/Makefile f90modspec`"
++ 	    F90_MODINCFLAG="`$MAKE -s -f ../../f90modules/Makefile f90modflag`"
++  	    F90MODINCSPEC="`$MAKE -s -f ../../f90modules/Makefile f90modspec`"
+             if test -z "$USER_SET_F90INC" -a -z "$F90INC" ; then
+ 	        # This should use a test or try to get it from the f90module.
+-	        F90INC=`$MAKE -f ../../f90modules/Makefile f90incflag`
++	        F90INC=`$MAKE -s -f ../../f90modules/Makefile f90incflag`
+             fi
+         fi
+     fi
+--- mpich-1.2.7.orig/mpe/aclocal_f77.m4
++++ mpich-1.2.7/mpe/aclocal_f77.m4
+@@ -398,7 +398,8 @@
+     fi
+     AC_MSG_CHECKING([if ${F77-f77} $flags $libs works with GETARG and IARGC])
+     if AC_TRY_EVAL(ac_fcompilelink) && test -x conftest ; then
+-	if test "$ac_cv_prog_f77_cross" = "no" ; then
++	# Check that cross != yes so that this works with autoconf 2.52
++	if test "$ac_cv_prog_f77_cross" != "yes" ; then
+ 	    if ./conftest >/dev/null 2>&1 ; then
+ 		found_answer="yes"
+ 	        FXX_MODULE="$fxx_module"
+@@ -492,7 +493,7 @@
+ +U77"
+     fi
+     # Discard options that are not available:
+-    save_IFS="$IFS"
++    #save_IFS="$IFS"
+     IFS=" 
+ "
+     save_trial_FLAGS="$trial_FLAGS"
+@@ -594,6 +595,13 @@
+ 		continue
+ 	   fi
+ 	   ;;
++	7) # gfortran won't find getarg if it is marked as external
++	   FXX_MODULE=""
++	   F77_GETARGDECL="intrinsic GETARG"
++	   F77_GETARG="call GETARG(i,s)"
++	   F77_IARGC="IARGC()"
++	   MSG="intrinsic GETARG and IARGC"
++	   ;;
+         *) # exit from while loop
+ 	   FXX_MODULE=""
+ 	   F77_GETARGDECL=""
+@@ -637,7 +645,7 @@
+ 	        ac_fcompilelink_test="${F77-f77} -o conftest $FFLAGS $flags conftest.f $LDFLAGS $libs $LIBS 1>&AC_FD_CC"
+ 		found_answer="no"
+                 if AC_TRY_EVAL(ac_fcompilelink_test) && test -x conftest ; then
+-		    if test "$ac_cv_prog_f77_cross" = "no" ; then
++		    if test "$ac_cv_prog_f77_cross" != "yes" ; then
+ 			if ./conftest >/dev/null 2>&1 ; then
+ 			    found_answer="yes"
+ 			fi
--- mpich-1.2.7.orig/debian/patches/00list
+++ mpich-1.2.7/debian/patches/00list
@@ -0,0 +1,21 @@
+02_mpeshlibs
+03_move_logfile
+04_hackg2c
+05_tvshlib
+06_mpichboot_homedir
+07_makesharedlib-errorcheck
+09_remove_p4_from_clean_execer_port
+10_pass_cflags_to_mpid_mpd
+13_upstream_patchlevel1
+14_romio_fPIC
+15_shared_c++
+16_initf_in_shlib
+17_mpd_rm_extern_arrays
+18_link_against_needed_libs
+19_kfreebsd
+20_remove_symbols_from_darray
+21_hurd_support
+22_gfortran
+23_gcc4.3
+24_use_gnu_source_for_mpd.dpatch
+25_use_posix_termios_interface.dpatch
--- mpich-1.2.7.orig/debian/patches/01_destdir.dpatch
+++ mpich-1.2.7/debian/patches/01_destdir.dpatch
@@ -0,0 +1,659 @@
+#! /bin/sh -e
+## 01_destdir.dpatch by Junichi Uekawa <dancer@debian.org>
+## (original made by some of the former maintainers)
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds DESTDIR support to MPICH build rules.
+## DP: sent upstream
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+--- mpich-1.2.5.orig/mpe/sbin/mpeinstall.in
++++ mpich-1.2.5/mpe/sbin/mpeinstall.in
+@@ -76,7 +76,7 @@
+ if [ -z "$UNINSTALLFILE" ] ; then
+     INSTALL_base=`basename $0`
+     UNINSTALL_base=`echo $INSTALL_base | sed -e 's/install/uninstall/'`
+-    UNINSTALLFILE=${sbindir}/${UNINSTALL_base}
++    UNINSTALLFILE=$DESTDIR${sbindir}/${UNINSTALL_base}
+ fi
+ 
+ for arg in "$@" ; do
+@@ -155,10 +155,11 @@
+ else
+     mode=$3
+ fi
+-if [ -d $2 ] ; then
+-    dest=$2/`basename $1`
++dest=$DESTDIR$2
++if [ -d $dest ] ; then
++    dest=$dest/`basename $1`
+ else
+-    dest=$2
++    dest=$dest
+ fi
+ if [ $replace = 0 -a -f $dest ] ; then
+     if [ $verbose = 1 ] ; then echo "$dest exists; not changed" ; fi
+@@ -216,7 +217,7 @@
+         set $1 $2 ${3:-$MODE} `pwd`
+         cd $1
+         for file in * ; do
+-            if [ -f $file -a ! -f $2/$file ] ; then
++            if [ -f $file -a ! -f $DESTDIR$2/$file ] ; then
+                 CopyFileP $file $2/$file $3
+             fi
+         done
+@@ -230,20 +231,18 @@
+         done
+         # cd back where it comes from
+         # counter the effect of "cd $1" above,
+-        # so "for" loop stiil works
++        # so "for" loop still works
+         cd $4
+     fi 
+ fi
+ }
+ 
+-
+-
+ #
+ # Make the given directory.  This handles building intermediate directories
+ # as required, and maintains a list of created directories in dirlist.
+ MkDir() {
+-if [ ! -d $1 ] ; then
+-    dir=`echo $1 | sed 's%/% /%g'`
++if [ ! -d $DESTDIR$1 ] ; then
++    dir=`echo $DESTDIR$1 | sed 's%/% /%g'`
+     path_to_date=''
+     for path in $dir ; do
+         path_to_date="$path_to_date$path"
+@@ -279,10 +278,11 @@
+ # Fixup files that need #...# replaced
+ #
+ FixupFile() {
+-if [ -d $2 ] ; then
+-    dest=$2/`basename $1`
++dest=$DESTDIR$2
++if [ -d $dest ] ; then
++    dest=$dest/`basename $1`
+ else
+-    dest=$2
++    dest=$dest
+ fi
+ if [ $replace = 0 -a -f $dest ] ; then
+     if [ $verbose = 1 ] ; then echo "$dest exists; not changed" ; fi
+@@ -315,7 +315,7 @@
+ else
+     mode=$3
+ fi
+-$Show chmod $mode $2
++$Show chmod $mode $dest
+ rc=$?
+ if [ $rc != 0 ] ; then
+     echo "**Error setting mode on file $2**"
+@@ -375,11 +375,11 @@
+ if [ -n "$includebuild_dir" ] ; then
+     if [ -d $includebuild_dir ] ; then
+         echo "Copying MPE include files to $includedir"
+-	if [ ! -d $includedir ] ; then
++	if [ ! -d $DESTDIR$includedir ] ; then
+ 	    MkDir $includedir
+ 	fi
+ 	for file in $MPE_HEADERS ; do
+-	    if [ -f $includebuild_dir/$file -a ! -f $includedir/$file ] ; then
++	    if [ -f $includebuild_dir/$file -a ! -f $DESTDIR$includedir/$file ] ; then
+ 	        CopyFileP $includebuild_dir/$file $includedir/$file $MODE
+ 	    fi
+ 	done
+@@ -401,7 +401,7 @@
+          CopyDirRecurP $binbuild_dir $bindir $XMODE
+     fi
+     # Create mpereconfig from mpereconfig.in
+-    $Show /bin/rm -f $bindir/mpereconfig
++    $Show /bin/rm -f $DESTDIR$bindir/mpereconfig
+     if [ $verbose = 1 ] ; then
+         echo "Creating mpereconfig from mpereconfig.in"
+     fi
+@@ -441,9 +441,9 @@
+ 		-e "s%^ac_given_srcdir=.*$%ac_given_srcdir=%g" \
+ 		-e '/if test "\$ac_dir/,/^[ ]*fi[ ]*$/d' \
+ 		-e 's/ac_dir_suffix/ac_dir/' \
+-                > $bindir/mpereconfig.dat
++                > ${DESTDIR}$bindir/mpereconfig.dat
+         filelist="$filelist $bindir/mpereconfig.dat"
+-        chmod $XMODE $bindir/mpereconfig.dat
++        chmod $XMODE ${DESTDIR}$bindir/mpereconfig.dat
+     else 
+         cat <<.
+             cat config.status | \
+@@ -466,9 +466,9 @@
+ 		-e "s%^ac_given_srcdir=.*$%ac_given_srcdir=%g" \
+ 		-e '/if test "\$ac_dir/,/^[ ]*fi[ ]*$/d' \
+ 		-e 's/ac_dir_suffix/ac_dir/' \
+-                > $bindir/mpereconfig.dat
++                > $DESTDIR$bindir/mpereconfig.dat
+         filelist="$filelist $bindir/mpereconfig.dat"
+-        chmod $XMODE $bindir/mpereconfig.dat
++        chmod $XMODE $DESTDIR$bindir/mpereconfig.dat
+     else 
+         cat <<.
+             cat config.status | \
+@@ -488,23 +488,25 @@
+ CopyDirRecurP $top_srcdir/contrib/test $examplesdir
+ 
+ # Create MPE examples Makefile
+-( cd $examplesdir ; $bindir/mpereconfig Makefile ) 
++( cd $DESTDIR$examplesdir ; $bindir/mpereconfig Makefile ) 
+ filelist="$filelist $examplesdir/Makefile"
+ 
+ if [ -x $bindir/mpirun ] ; then
+-    $Show "( cd $examplesdir ; \
++    $Show "( cd $DESTDIR$examplesdir ; \
+              /bin/rm -f mpirun ; \
+              ln -s $bindir/mpirun mpirun )"
+     filelist="$filelist $examplesdir/mpirun" 
+ fi
+- 
+-if [ -f $examplesdir/Makefile ] ; then
++
++if [ -z "$DESTDIR" ]; then 
++  if [ -f $DESTDIR$examplesdir/Makefile ] ; then
+     echo "About to run installation test for C programs..."
+-    $Show "( cd $examplesdir ; $MAKE linktest_C )"
++    $Show "( cd $DESTDIR$examplesdir ; $MAKE linktest_C )"
+     if test "$NOF77" = "0" ; then
+         echo "About to run installation test for Fortran programs..."
+         $Show "( cd $examplesdir ; $MAKE linktest_f77 )"
+     fi
++  fi
+ fi
+ 
+ # Remove old uninstall file
+@@ -537,7 +539,7 @@
+     fi
+ fi
+ 
+-if [ -s $examplesdir/Makefile ] ; then
++if [ -s $DESTDIR$examplesdir/Makefile ] ; then
+     echo "( cd $examplesdir ; $MAKE clean )" >> $UNINSTALLFILE
+ fi
+ 
+--- mpich-1.2.5.orig/mpe/viewers/sbin/install-viewers.in
++++ mpich-1.2.5/mpe/viewers/sbin/install-viewers.in
+@@ -62,7 +62,7 @@
+ if [ -z "$UNINSTALLFILE" ] ; then
+     INSTALL_base=`basename $0`
+     UNINSTALL_base=`echo $INSTALL_base | sed -e 's/install/uninstall/'`
+-    UNINSTALLFILE=${sbindir}/${UNINSTALL_base}
++    UNINSTALLFILE=$DESTDIR${sbindir}/${UNINSTALL_base}
+ fi
+ 
+ # Update the $prefix if necessary
+@@ -134,10 +134,11 @@
+ else
+     mode=$3
+ fi
+-if [ -d $2 ] ; then
+-    dest=$2/`basename $1`
++dest=$DESTDIR$2
++if [ -d $dest ] ; then
++    dest=$dest/`basename $1`
+ else
+-    dest=$2
++    dest=$dest
+ fi
+ if [ $replace = 0 -a -f $dest ] ; then
+     if [ $verbose = 1 ] ; then echo "$dest exists; not changed" ; fi
+@@ -200,7 +201,7 @@
+         set $1 $2 ${3:-$MODE} `pwd`
+         cd $1
+         for file in * ; do
+-            if [ -f $file -a ! -f $2/$file ] ; then
++            if [ -f $file -a ! -f $DESTDIR$2/$file ] ; then
+                 CopyFileP $file $2/$file $3
+             fi
+         done
+@@ -225,8 +226,8 @@
+ # Make the given directory.  This handles building intermediate directories
+ # as required, and maintains a list of created directories in dirlist.
+ MkDir() {
+-if [ ! -d $1 ] ; then
+-    dir=`echo $1 | sed 's%/% /%g'`
++if [ ! -d $DESTDIR$1 ] ; then
++    dir=`echo $DESTDIR$1 | sed 's%/% /%g'`
+     path_to_date=''
+     for path in $dir ; do
+         path_to_date="$path_to_date$path"
+@@ -268,10 +269,11 @@
+     # Change the FIRST libpath to the new form.  This allows 
+     # the LIB_PATH to contain multiple names, as long as the MPICH libpath
+     # is first
+-if [ -d $2 ] ; then
+-    dest=$2/`basename $1`
++dest=$DESTDIR$2
++if [ -d $dest ] ; then
++    dest=$dest/`basename $1`
+ else
+-    dest=$2
++    dest=$dest
+ fi
+ if [ $replace = 0 -a -f $dest ] ; then
+     if [ $verbose = 1 ] ; then echo "$dest exists; not changed" ; fi
+@@ -301,7 +303,7 @@
+ else
+     mode=$3
+ fi
+-$Show chmod $mode $2
++$Show chmod $mode $dest
+ rc=$?
+ if [ $rc != 0 ] ; then
+     echo "**Error setting mode on file $2**"
+@@ -330,7 +332,7 @@
+     echo "Install into $prefix"
+ fi
+ 
+-if [ -d $prefix ] ; then
++if [ -d $DESTDIR$prefix ] ; then
+     if [ $verbose = 1 ] ; then echo "using existing directory $prefix" ; fi
+ else
+     MkDir $prefix
+@@ -341,7 +343,7 @@
+     sbindir=$prefix/sbin
+     datadir=$prefix/share
+     if [ $appendUninstall = 0 ] ; then
+-        UNINSTALLFILE=${sbindir}/${UNINSTALL_base}
++        UNINSTALLFILE=$DESTDIR${sbindir}/${UNINSTALL_base}
+     fi
+ fi
+ 
+--- mpich-1.2.5.orig/mpe/viewers/upshot/sbin/install-viewer.in
++++ mpich-1.2.5/mpe/viewers/upshot/sbin/install-viewer.in
+@@ -60,7 +60,7 @@
+ if [ -z "$UNINSTALLFILE" ] ; then
+     INSTALL_base=`basename $0`
+     UNINSTALL_base=`echo $INSTALL_base | sed -e 's/install/uninstall/'`
+-    UNINSTALLFILE=${sbindir}/${UNINSTALL_base}
++    UNINSTALLFILE=$DESTDIR${sbindir}/${UNINSTALL_base}
+ fi
+ 
+ # Update the $prefix if necessary
+@@ -132,10 +132,11 @@
+ else
+     mode=$3
+ fi
+-if [ -d $2 ] ; then
+-    dest=$2/`basename $1`
++dest=$DESTDIR$2
++if [ -d $dest ] ; then
++    dest=$dest/`basename $1`
+ else
+-    dest=$2
++    dest=$dest
+ fi
+ if [ $replace = 0 -a -f $dest ] ; then
+     if [ $verbose = 1 ] ; then echo "$dest exists; not changed" ; fi
+@@ -198,7 +199,7 @@
+         set $1 $2 ${3:-$MODE} `pwd`
+         cd $1
+         for file in * ; do
+-            if [ -f $file -a ! -f $2/$file ] ; then
++            if [ -f $file -a ! -f $DESTDIR$2/$file ] ; then
+                 CopyFileP $file $2/$file $3
+             fi
+         done
+@@ -223,8 +224,8 @@
+ # Make the given directory.  This handles building intermediate directories
+ # as required, and maintains a list of created directories in dirlist.
+ MkDir() {
+-if [ ! -d $1 ] ; then
+-    dir=`echo $1 | sed 's%/% /%g'`
++if [ ! -d $DESTDIR$1 ] ; then
++    dir=`echo $DESTDIR$1 | sed 's%/% /%g'`
+     path_to_date=''
+     for path in $dir ; do
+         path_to_date="$path_to_date$path"
+@@ -266,10 +267,11 @@
+     # Change the FIRST libpath to the new form.  This allows 
+     # the LIB_PATH to contain multiple names, as long as the MPICH libpath
+     # is first
+-if [ -d $2 ] ; then
+-    dest=$2/`basename $1`
++dest=$DESTDIR$2
++if [ -d $dest ] ; then
++    dest=$dest/`basename $1`
+ else
+-    dest=$2
++    dest=$dest
+ fi
+ if [ $replace = 0 -a -f $dest ] ; then
+     if [ $verbose = 1 ] ; then echo "$dest exists; not changed" ; fi
+@@ -300,7 +302,7 @@
+ else
+     mode=$3
+ fi
+-$Show chmod $mode $2
++$Show chmod $mode $dest
+ rc=$?
+ if [ $rc != 0 ] ; then
+     echo "**Error setting mode on file $2**"
+--- mpich-1.2.5.orig/mpe/tmp/confdefs.h
++++ mpich-1.2.5/mpe/tmp/confdefs.h
+@@ -0,0 +1 @@
++
+--- mpich-1.2.5.orig/mpe/confdefs.h
++++ mpich-1.2.5/mpe/confdefs.h
+@@ -0,0 +1 @@
++
+--- mpich-1.2.5.orig/mpid/ch_p4mpd/install_ch_p4mpd
++++ mpich-1.2.5/mpid/ch_p4mpd/install_ch_p4mpd
+@@ -10,9 +10,9 @@
+ fi
+ if [ -f mpid/mpd/Makefile ] ; then
+     export XMODE
+-    (cd mpid/mpd ; $MAKE install UNINSTALLFILE=$UNINSTALLFILE )
+-    rm -f ${bindir}/mpichboot
+-    cat >${bindir}/mpichboot <<EOF
++    (cd mpid/mpd ; $MAKE install UNINSTALLFILE=$UNINSTALLFILE DESTDIR=$DESTDIR )
++    rm -f $DESTDIR${bindir}/mpichboot
++    cat >$DESTDIR${bindir}/mpichboot <<EOF
+ #! /bin/sh
+ if [ ! -s $HOME/.mpdpasswd -a ! -s $HOME/.mpd.conf ] ; then
+     echo "In mpichboot:"
+@@ -24,14 +24,14 @@
+ # calling process.  
+ ${bindir}/mpd -b &
+ EOF
+-    chmod $XMODE ${bindir}/mpichboot
++    chmod $XMODE $DESTDIR${bindir}/mpichboot
+     echo "rm -f ${bindir}/mpichboot" >>$UNINSTALLFILE
+-    rm -f ${bindir}/mpichstop
+-    cat >${bindir}/mpichstop <<EOF
++    rm -f $DESTDIR${bindir}/mpichstop
++    cat >$DESTDIR${bindir}/mpichstop <<EOF
+ #! /bin/sh
+ ${bindir}/mpdallexit
+ EOF
+-    chmod $XMODE ${bindir}/mpichstop
++    chmod $XMODE $DESTDIR${bindir}/mpichstop
+     echo "rm -f ${bindir}/mpichstop" >>$UNINSTALLFILE
+ else
+     echo "Could not find Makefile for mpid/mpd!"
+--- mpich-1.2.5.orig/mpid/mpd/Makefile.in
++++ mpich-1.2.5/mpid/mpd/Makefile.in
+@@ -2,7 +2,7 @@
+ 
+ @SET_MAKE@
+ @VPATH@
+-prefix    = @prefix@
++prefix    ?= @prefix@
+ exec_prefix = @exec_prefix@
+ bindir    = @bindir@
+ srcdir	  = @srcdir@
+@@ -126,32 +126,32 @@
+ # startdaemons at least temporarily obsolete      
+ #	sed -e "s/^DIR=.*$/DIR=${bindir}/g" ${top_srcdir}/mpid/mpd/startdaemons.in ${bindir}/startdaemons
+ #	chmod ${XMODE} ${bindir}/startdaemons
+-	if [ ! -d ${bindir} ] ; then \
+-	    mkdir -p ${bindir} ;\
++	if [ ! -d ${DESTDIR}${bindir} ] ; then \
++	    mkdir -p ${DESTDIR}${bindir} ;\
+ 	fi   
+-	cp -f mpd ${bindir}/mpd
+-	cp -f mpdcon ${bindir}/mpdcon
++	cp -f mpd ${DESTDIR}${bindir}/mpd
++	cp -f mpdcon ${DESTDIR}${bindir}/mpdcon
+ 	@if [ "`whoami`" = "root" ] ; then \
+-	    echo "chmod 4755 ${bindir}/mpdcon" ;\
+-	    chmod 4755 ${bindir}/mpdcon ;\
++	    echo "chmod 4755 ${DESTDIR}${bindir}/mpdcon" ;\
++	    chmod 4755 ${DESTDIR}${bindir}/mpdcon ;\
+ 	fi
+-	cp -f mpdman ${bindir}/mpdman
++	cp -f mpdman ${DESTDIR}${bindir}/mpdman
+ #	if [ -f startdaemons -a mpd.hosts ] ; then \
+-#	    cp startdaemons ${bindir}/startdaemons ;\
+-#	    cp mpd.hosts ${bindir}/mpd.hosts ;\
++#	    cp startdaemons ${DESTDIR}${bindir}/startdaemons ;\
++#	    cp mpd.hosts ${DESTDIR}${bindir}/mpd.hosts ;\
+ #	fi
+ 	-@for cmd in ${CMDS_FROM_CON} ; do \
+-	    rm -f ${bindir}/$$cmd ; \
+-	    @LN_S@ -f ${bindir}/mpdcon ${bindir}/$$cmd ; done
++	    rm -f ${DESTDIR}${bindir}/$$cmd ; \
++	    @LN_S@ -f ${DESTDIR}${bindir}/mpdcon ${DESTDIR}${bindir}/$$cmd ; done
+ #  Some other part of mpich install might have created an mpirun
+-	/bin/rm -f ${bindir}/mpirun
+-	@LN_S@ -f ${bindir}/mpdcon ${bindir}/mpirun
++	/bin/rm -f ${DESTDIR}${bindir}/mpirun
++	@LN_S@ -f ${DESTDIR}${bindir}/mpdcon ${DESTDIR}${bindir}/mpirun
+ 	-@if [ -n "${UNINSTALLFILE}" ] ; then \
+ 	    for file in mpd mpdcon mpdman mpdtrace mpddump mpdexit mpirun \
+ 	        mpdallexit mpdbomb mpdhelp mpdcleanup mpdmpexec \
+ 	        mpdclean \
+ 		mpigdb mpdmandump mpdlistjobs mpdkilljob mpdringtest mpdringsize mpdshutdown; do \
+-	        echo "/bin/rm -f ${bindir}/$$file" >> "${UNINSTALLFILE}" ; \
++	        echo "/bin/rm -f ${DESTDIR}${bindir}/$$file" >> "${UNINSTALLFILE}" ; \
+ 	    done ; \
+ 	fi
+ #
+--- mpich-1.2.5.orig/util/mpiinstall.in
++++ mpich-1.2.5/util/mpiinstall.in
+@@ -186,7 +186,7 @@
+ 
+ # Uninstall filename
+ if [ -z "$UNINSTALLFILE" ] ; then 
+-    UNINSTALLFILE="$sbindir/mpiuninstall"
++    UNINSTALLFILE="$DESTDIR$sbindir/mpiuninstall"
+ fi
+ 
+ if [ -z "$APREFIX" ] ; then
+@@ -222,10 +222,11 @@
+ else
+     mode=$3
+ fi
+-if [ -d $2 ] ; then
+-    dest=$2/`basename $1`
++dest=$DESTDIR$2
++if [ -d $dest ] ; then
++    dest=$dest/`basename $1`
+ else
+-    dest=$2
++    dest=$dest
+ fi
+ if [ $replace = 0 -a -f $dest ] ; then
+     if [ $verbose = 1 ] ; then echo "$dest exists; not changed" ; fi
+@@ -274,8 +275,8 @@
+ # Make the given directory.  This handles building intermediate directories
+ # as required, and maintains a list of created directories in dirlist.
+ MkDir() {
+-if [ ! -d $1 ] ; then
+-    dir_to_make=`echo $1 | sed 's%/% /%g'`
++if [ ! -d $DESTDIR$1 ] ; then
++    dir_to_make=`echo $DESTDIR$1 | sed 's%/% /%g'`
+     path_to_date=''
+     for path in $dir_to_make ; do
+ 	path_to_date="$path_to_date$path"
+@@ -310,10 +311,11 @@
+ # perl program.  mpireconfig can use FixupFile2 .
+ #
+ FixupFile() {
+-if [ -d $2 ] ; then
+-    dest=$2/`basename $1`
++dest=$DESTDIR$2
++if [ -d $dest ] ; then
++    dest=$dest/`basename $1`
+ else
+-    dest=$2
++    dest=$dest
+ fi
+ if [ $replace = 0 -a -f $dest ] ; then
+     if [ $verbose = 1 ] ; then echo "$dest exists; not changed" ; fi
+@@ -349,7 +351,7 @@
+ else
+     mode=$3
+ fi
+-$Show chmod $mode $2
++$Show chmod $mode $dest
+ rc=$?
+ if [ $rc != 0 ] ; then
+     echo "**Error setting mode on file $2**"
+@@ -362,10 +364,11 @@
+ # This version merely replaces builddir versions with the master versions
+ # 
+ FixupFile2() {
+-if [ -d $2 ] ; then
+-    dest=$2/`basename $1`
++dest=$DESTDIR$2
++if [ -d $dest ] ; then
++    dest=$dest/`basename $1`
+ else
+-    dest=$2
++    dest=$dest
+ fi
+ if [ $replace = 0 -a -f $dest ] ; then
+     if [ $verbose = 1 ] ; then echo "$dest exists; not changed" ; fi
+@@ -402,7 +405,7 @@
+ else
+     mode=$3
+ fi
+-$Show chmod $mode $2
++$Show chmod $mode $dest
+ rc=$?
+ if [ $rc != 0 ] ; then
+     echo "**Error setting mode on file $2**"
+@@ -478,7 +481,7 @@
+     CopyFile util/mpichlib.conf ${sysconfdir} 
+     #
+     # mpiman
+-    $Show /bin/rm -f $bindir/mpiman
++    $Show /bin/rm -f $DESTDIR$bindir/mpiman
+     FixupFile2 bin/mpiman $bindir/mpiman $XMODE
+     #
+     # mpirun et al.  This would be a good place to identify 
+@@ -511,7 +514,7 @@
+         CopyFile $top_srcdir/bin/tarch $bindir $XMODE
+     fi
+     #
+-    $Show /bin/rm -f $bindir/mpireconfig
++    $Show /bin/rm -f $DESTDIR$bindir/mpireconfig
+     if [ $verbose = 1 ] ; then 
+         echo "Creating mpireconfig from util/mpireconfig.in"
+     fi
+@@ -542,8 +545,8 @@
+         -e "s%^MPIF77=\([^/ ]*\)/.*\$%MPIF77=$bindir/mpif77%g" \
+         -e "s%^MPIF90=\([^/ ]*\)/.*\$%MPIF90=$bindir/mpif90%g" \
+         -e "s%^MPICPLUSPLUS=\([^/ ]*\)/.*\$%MPICPLUSPLUS=$bindir/mpiCC%g" \
+-		config.status > ${bindir}/mpireconfig.dat
+-    chmod $XMODE ${bindir}/mpireconfig.dat
++		config.status > ${DESTDIR}${bindir}/mpireconfig.dat
++    chmod $XMODE ${DESTDIR}${bindir}/mpireconfig.dat
+     echo "/bin/rm -f ${bindir}/mpireconfig.dat" >> $UNINSTALLFILE
+     else
+         echo "Construct new ${bindir}/mpireconfig.dat from config.status"
+@@ -760,15 +763,15 @@
+ # Get the current directory (see pushd/popd comments in shared lib code)
+ curdir="`pwd`"
+ # Create links from foo.so.n.m to foo.so.n and foo.so.n to foo.so
+-for file in $libdir/libtvmpich.so* ; do
++for file in $DESTDIR$libdir/libtvmpich.so* ; do
+     # pushd would be cleaner, but not all systems support it (e.g.,IRIX)
+     #pushd $sharedlib_dir >/dev/null
+-    cd $libdir >/dev/null
++    cd $DESTDIR$libdir >/dev/null
+     file=`basename $file`
+     filebase=`echo $file | sed -e 's%\.[0-9]*$%%'`
+     while [ $filebase != $file ]; do
+ 	 if [ ! -h $filebase -a -s $file ] ; then 
+-	     $Show ln -s $file $filebase
++	     $Show ln -sf $file $filebase
+ 	     # We need to debug this.  If there is an error, generate
+ 	     # some information on the failure
+              if [ $? != 0 ] ; then
+@@ -807,15 +810,15 @@
+ # Get the current directory (see pushd/popd comments below)
+ curdir=`pwd`
+ # Create links from foo.so.n.m to foo.so.n and foo.so.n to foo.so
+-for file in $sharedlib_dir/*.so* ; do
++for file in $DESTDIR$sharedlib_dir/*.so* ; do
+     # pushd would be cleaner, but not all systems support it (e.g.,IRIX)
+     #pushd $sharedlib_dir >/dev/null
+-    cd $sharedlib_dir >/dev/null
++    cd $DESTDIR$sharedlib_dir >/dev/null
+     file=`basename $file`
+     filebase=`echo $file | sed -e 's%\.[0-9]*$%%'`
+     while [ $filebase != $file ]; do
+ 	 if [ ! -h $filebase -a -s $file ] ; then 
+-	     $Show ln -s $file $filebase
++	     $Show ln -sf $file $filebase
+ 	     echo "/bin/rm -f $sharedlib_dir/$filebase" >>$UNINSTALLFILE
+ 	 fi
+ 	 file=$filebase
+@@ -828,8 +831,8 @@
+ #
+ 
+ # Handle the case of a weak-symbol profiling library
+-if [ ! -s $libdir/libp@MPILIBNAME@.a ] ; then
+-    (cd $libdir ; ln -s lib@MPILIBNAME@.a libp@MPILIBNAME@.a )
++if [ ! -s $DESTDIR$libdir/libp@MPILIBNAME@.a ] ; then
++    (cd $DESTDIR$libdir ; ln -s lib@MPILIBNAME@.a libp@MPILIBNAME@.a )
+     echo "/bin/rm -f $libdir/libp@MPILIBNAME@.a" >> $UNINSTALLFILE
+ fi
+ # Message queue routine for debuggers must be built with the proper prefix.
+@@ -968,11 +971,11 @@
+ # prefix=@prefix@ when ever prefix= starts in the first column (!)
+ # It also does this with exec_prefix (!!)
+      prefix=$APREFIX
+-(cd $prefix/examples ; $bindir/mpireconfig Makefile )
++(cd $DESTDIR$prefix/examples ; $DESTDIR$bindir/mpireconfig Makefile )
+ echo "(cd $prefix/examples ; $MAKE clean)" >> $UNINSTALLFILE
+ echo "/bin/rm -f $prefix/examples/Makefile" >> $UNINSTALLFILE
+      prefix=$Savevar
+-CopyFile $prefix/examples/Makefile $datadir/Makefile.sample
++CopyFile $DESTDIR$prefix/examples/Makefile $datadir/Makefile.sample
+ CopyFile $top_srcdir/installtest/cpi.c $prefix/examples
+ CopyFile $top_srcdir/installtest/cpip.c $prefix/examples
+ CopyFile $top_srcdir/installtest/cpilog.c $prefix/examples
+@@ -990,15 +993,18 @@
+ CopyFile $top_srcdir/installtest/README $prefix/examples
+ #
+ # Test build the examples
+-$Show "(cd $prefix/examples ; /bin/rm -f mpirun ; \
++$Show "(cd $DESTDIR$prefix/examples ; /bin/rm -f mpirun ; \
+ 	  ln -s ../bin/mpirun mpirun )"
+ echo "/bin/rm -f $prefix/examples/mpirun" >> $UNINSTALLFILE
+ #
+ echo "About to run installation test..."
+-$Show "(cd $prefix/examples; $MAKE all ; $MAKE clean )"
+-if [ @SHAREDKIND@ != "ignore" ] ; then
++if [ "x$DESTDIR" = "x" ]; then
++  # only works when DESTDIR is blank, and installing on final location.
++  $Show "(cd $DESTDIR$prefix/examples; $MAKE all ; $MAKE clean )"
++  if [ @SHAREDKIND@ != "ignore" ] ; then
+     echo "About to run installation test for shared libraries ..."
+-    $Show "(cd $prefix/examples; MPICH_USE_SHLIB="yes"; export MPICH_USE_SHLIB; $MAKE all ; $MAKE clean )"
++    $Show "(cd $DESTDIR$prefix/examples; MPICH_USE_SHLIB="yes"; export MPICH_USE_SHLIB; $MAKE all ; $MAKE clean )"
++  fi
+ fi
+ #
+ # This SHOULD use mpireconfig...
+@@ -1048,7 +1054,7 @@
+     echo "if [ -d $dir ] ; then rmdir $dir ; fi" >> $UNINSTALLFILE
+ done
+ #
+-echo installed MPICH in $prefix
++echo installed MPICH in $prefix 
+ echo $UNINSTALLFILE may be used to remove the installation.
+ #
+ if [ $errs -gt 0 ] ; then
--- mpich-1.2.7.orig/debian/patches/20_remove_symbols_from_darray.dpatch
+++ mpich-1.2.7/debian/patches/20_remove_symbols_from_darray.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh -e
+## 20_remove_symbols_from_darray.dpatch by Adam Powell <hazelsct@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove symbols which clash with ad_darray.c, first in 1.2.7-2.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+
+
+--- mpich-1.2.7.orig/src/misc2/darray.c	2004-08-27 15:08:25.000000000 -0400
++++ mpich-1.2.7/src/misc2/darray.c	2006-10-06 15:19:13.610003320 -0400
+@@ -278,7 +278,7 @@
+ }
+ 
+ 
+-#ifndef MPI_BUILD_PROFILING
++#if 0
+ int MPIOI_Type_block(int *array_of_gsizes, int dim, int ndims, int nprocs,
+ 		      int rank, int darg, int order, MPI_Aint orig_extent,
+ 		      MPI_Datatype type_old, MPI_Datatype *type_new,
--- mpich-1.2.7.orig/debian/patches/16_initf_in_shlib.dpatch
+++ mpich-1.2.7/debian/patches/16_initf_in_shlib.dpatch
@@ -0,0 +1,41 @@
+#! /bin/sh -e
+## 16_initf_in_shlib.dpatch by Adam Powell <hazelsct@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove stuff which strips initf etc. from shlibs, first in 1.2.5.3-2.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+
+
+--- mpich-1.2.7.orig/Makefile.in	2006-10-06 14:58:27.000000000 -0400
++++ mpich-1.2.7/Makefile.in	2006-10-06 15:00:06.803344432 -0400
+@@ -194,14 +194,12 @@
+ 	for lib in lib${MPILIBNAME}.a libp${MPILIBNAME}.a \
+             lib${FMPILIBNAME}.a ; do \
+ 	    if [ -s $$lib ] ; then \
+-	      ${top_srcdir}/util/makesharedlib -exceptobjs="farg.o _farg.o farg90.o _farg90.o initf.o _initf.o" \
+-		  -lib=$$lib -kind=@SHAREDKIND@ ; \
++	      ${top_srcdir}/util/makesharedlib -lib=$$lib -kind=@SHAREDKIND@ ; \
+ 	    fi ; \
+ 	done ; \
+         if [ $(NOF77) = 0 ] ; then \
+ 	    if [ "@FLIBNAME@" != "@MPILIBNAME@" ] ; then \
+-	      ${top_srcdir}/util/makesharedlib -exceptobjs="farg.o _farg.o farg90.o _farg90.o initf.o _initf.o" \
+-		  -lib=lib@FLIBNAME@.a -kind=@SHAREDKIND@ ; \
++	      ${top_srcdir}/util/makesharedlib -lib=lib@FLIBNAME@.a -kind=@SHAREDKIND@ ; \
+ 	        ${AR} x lib@FLIBNAME@.a farg.o initf.o 2>/dev/null ; \
+ 	        ${AR} cr lib@FLIBNAME@farg.a farg.o initf.o ; \
+ 	        rm -f farg.o initf.o ; \
--- mpich-1.2.7.orig/debian/patches/24_use_gnu_source_for_mpd.dpatch
+++ mpich-1.2.7/debian/patches/24_use_gnu_source_for_mpd.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 24_use_gnu_source_for_mpd.dpatch by Peter Green <plugwash@p10link.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: with latest glibc _GNU_SOURCE must be defined to use h_addr from
+## DP: struct hostent. This patch defines it for stuff in the mpid/mpd
+## DP: directory
+
+@DPATCH@
+diff -urNad mpich-1.2.7~/mpid/mpd/Makefile.in mpich-1.2.7/mpid/mpd/Makefile.in
+--- mpich-1.2.7~/mpid/mpd/Makefile.in	      2003-02-04 21:05:59.000000000 +0000
++++ mpich-1.2.7/mpid/mpd/Makefile.in	      2009-04-05 23:41:39.000000000 +0100
+@@ -16,7 +16,7 @@
+ LDFLAGS   = @LDFLAGS@
+ LIBS	     = @LIBS@ 
+ GDB       = @GDB@
+-CFLAGS    = @CFLAGS@
++CFLAGS    = @CFLAGS@ -D_GNU_SOURCE
+ 
+ C_COMPILE = ${CC} ${INCLUDES} ${CFLAGS} ${COPTIONS}
+ C_LINK	     = ${CLINKER} ${CFLAGS} ${COPTIONS} ${LDFLAGS}
--- mpich-1.2.7.orig/debian/patches/07_makesharedlib-errorcheck.dpatch
+++ mpich-1.2.7/debian/patches/07_makesharedlib-errorcheck.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh -e
+## Junichi Uekawa <dancer@debian.org>
+##
+## All lines beginning with ## DP: are a description of the patch.
+## DP: Fail if linking has failed, not ignoring errors.
+## DP: Not sent to upstream yet.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+
+--- mpich-1.2.7.orig/util/makesharedlib
++++ mpich-1.2.7/util/makesharedlib
+@@ -170,7 +170,12 @@
+         libbase=`basename $libname .a`
+ 	# The -h name sets the name of the object; this is necessary to 
+ 	# ensure that the dynamic linker can find the proper shared library.
+-        $CLINKER -shared -Wl,-h,$libbase.$slsuffix -o ../shared/$libbase.$slsuffix *.o $OtherLibs 
++        if $CLINKER -shared -Wl,-h,$libbase.$slsuffix -o ../shared/$libbase.$slsuffix *.o $OtherLibs ; then
++	    echo Successfully linked $libname
++	else
++	    echo "Linking $libname shared lib failed " 
++	    exit 1
++	fi
+         cd ..
+         # Make a link in the library directory to the shared library in the
+         # shared directory.
--- mpich-1.2.7.orig/debian/patches/06_mpichboot_homedir.dpatch
+++ mpich-1.2.7/debian/patches/06_mpichboot_homedir.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh -e
+## 06_mpichboot_homedir.dpatch by Adam Powell <hazelsct@debian.org>
+## (original made by some of the former maintainers)
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Escape $HOME so result has $HOME and not builder's home dir.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+--- mpich-1.2.7.orig/mpid/ch_p4mpd/install_ch_p4mpd	2003-06-20 16:54:21.000000000 -0400
++++ mpich-1.2.7/mpid/ch_p4mpd/install_ch_p4mpd	2003-06-20 16:55:19.000000000 -0400
+@@ -14,7 +14,7 @@
+     rm -f $DESTDIR${bindir}/mpichboot
+     cat >$DESTDIR${bindir}/mpichboot <<EOF
+ #! /bin/sh
+-if [ ! -s $HOME/.mpdpasswd -a ! -s $HOME/.mpd.conf ] ; then
++if [ ! -s \$HOME/.mpdpasswd -a ! -s \$HOME/.mpd.conf ] ; then
+     echo "In mpichboot:"
+     echo "A .mpd.conf file is required before starting an mpd demon."
+     echo "See the documentation on mpd in the User Manual."
--- mpich-1.2.7.orig/debian/patches/23_gcc4.3.dpatch
+++ mpich-1.2.7/debian/patches/23_gcc4.3.dpatch
@@ -0,0 +1,107 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 23_gcc4.3.dpatch by  <jamessan@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: gcc-4.3 removes the old compatibility headers like iostream.h.  Programs
+## DP: now must include iostream.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+
+
+--- mpich-1.2.7~/configure
++++ mpich-1.2.7/configure
+@@ -2738,13 +2738,13 @@
+   	    if test "$GXXTRIAL" = "xlC" -a "$DEVICE" = "ch_mpl" ; then
+ 	        GXXTRIAL=mpCC
+             fi
+-            # Test that this really works: compile iostream.h
++            # Test that this really works: compile iostream
+             # Don't assume that g++ works (it can be installed improperly; 
+             # it also doesn't work with 64-bit Solaris 2.7)
+             # (the autoconf tests are too GNU-centric)
+ 	    if test -n "$GXXTRIAL" ; then 
+                 cat > conftest.cc <<EOF
+-#include <iostream.h>
++#include <iostream>
+ EOF
+ 	        rm -f conftest.out
+   	        if $GXXTRIAL $CXXFLAGS -c conftest.cc >conftest.out 2>&1 ; then
+@@ -2813,8 +2813,8 @@
+ 	done
+     fi
+     # If we have a compiler, check that it works.  
+-    # pgCC failed to compile iostream.h on some Linux platforms
+-    # (we need this test here because the test for compiling iostream.h
++    # pgCC failed to compile iostream on some Linux platforms
++    # (we need this test here because the test for compiling iostream
+     # used above is used only to *find* a compiler; if the user selected
+     # a compiler that doesn't work, we still need the test.
+     if test -n "$CPP_COMPILER" ; then 
+@@ -2840,13 +2840,13 @@
+ 
+ fi
+ if test -z "$ac_echo_test" -a 1 = 1 ; then
+-echo $ac_n "checking whether selected C++ compiler can compile iostream.h""... $ac_c"
++echo $ac_n "checking whether selected C++ compiler can compile iostream""... $ac_c"
+ else
+-echo $ac_n "checking whether selected C++ compiler can compile iostream.h""... $ac_c" 1>&1
++echo $ac_n "checking whether selected C++ compiler can compile iostream""... $ac_c" 1>&1
+ fi
+         rm -f conftest*
+         cat > conftest.cc <<EOF
+-#include <iostream.h>	
++#include <iostream>	
+ EOF
+         if $CPP_COMPILER $CXXFLAGS -c conftest.cc>conftest.out 2>&1 ; then 
+             if test -z "$ac_echo_test" -a 1 = 1 ; then
+--- mpich-1.2.7~/configure.in
++++ mpich-1.2.7/configure.in
+@@ -1794,13 +1794,13 @@
+   	    if test "$GXXTRIAL" = "xlC" -a "$DEVICE" = "ch_mpl" ; then
+ 	        GXXTRIAL=mpCC
+             fi
+-            # Test that this really works: compile iostream.h
++            # Test that this really works: compile iostream
+             # Don't assume that g++ works (it can be installed improperly; 
+             # it also doesn't work with 64-bit Solaris 2.7)
+             # (the autoconf tests are too GNU-centric)
+ 	    if test -n "$GXXTRIAL" ; then 
+                 cat > conftest.cc <<EOF
+-#include <iostream.h>
++#include <iostream>
+ EOF
+ 	        rm -f conftest.out
+   	        if $GXXTRIAL $CXXFLAGS -c conftest.cc >conftest.out 2>&1 ; then
+@@ -1836,15 +1836,15 @@
+ 	done
+     fi
+     # If we have a compiler, check that it works.  
+-    # pgCC failed to compile iostream.h on some Linux platforms
+-    # (we need this test here because the test for compiling iostream.h
++    # pgCC failed to compile iostream on some Linux platforms
++    # (we need this test here because the test for compiling iostream
+     # used above is used only to *find* a compiler; if the user selected
+     # a compiler that doesn't work, we still need the test.
+     if test -n "$CPP_COMPILER" ; then 
+-        AC_MSG_CHECKING([whether selected C++ compiler can compile iostream.h])
++        AC_MSG_CHECKING([whether selected C++ compiler can compile iostream])
+         rm -f conftest*
+         cat > conftest.cc <<EOF
+-#include <iostream.h>	
++#include <iostream>	
+ EOF
+         if $CPP_COMPILER $CXXFLAGS -c conftest.cc>conftest.out 2>&1 ; then 
+             AC_MSG_RESULT(yes)
--- mpich-1.2.7.orig/debian/patches/14_romio_fPIC.dpatch
+++ mpich-1.2.7/debian/patches/14_romio_fPIC.dpatch
@@ -0,0 +1,44 @@
+#! /bin/sh -e
+## 14_romio_fPIC.dpatch by Adam Powell <hazelsct@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build ROMIO with -fPIC, first in 1.2.5.3-2.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+
+
+--- mpich-1.2.7.orig/romio/configure.in	2004-05-12 12:29:30.000000000 -0400
++++ mpich-1.2.7/romio/configure.in	2004-12-15 17:13:59.000000000 -0500
+@@ -1766,7 +1766,7 @@
+ AC_SUBST(GLUE_DIR)
+ 
+ #
+-CFLAGS="$CFLAGS -DHAVE_ROMIOCONF_H"
++CFLAGS="$CFLAGS -DHAVE_ROMIOCONF_H -fPIC"
+ #
+ 
+ if test -n "$MPIOF_H_INCLUDED"; then
+--- mpich-1.2.7.orig/romio/configure	2004-05-27 11:34:12.000000000 -0400
++++ mpich-1.2.7/romio/configure	2004-12-15 17:14:10.000000000 -0500
+@@ -11156,7 +11156,7 @@
+ 
+ 
+ #
+-CFLAGS="$CFLAGS -DHAVE_ROMIOCONF_H"
++CFLAGS="$CFLAGS -DHAVE_ROMIOCONF_H -fPIC"
+ #
+ 
+ if test -n "$MPIOF_H_INCLUDED"; then
--- mpich-1.2.7.orig/debian/patches/10_pass_cflags_to_mpid_mpd.dpatch
+++ mpich-1.2.7/debian/patches/10_pass_cflags_to_mpid_mpd.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh -e
+## Junichi Uekawa <dancer@debian.org>
+##
+## All lines beginning with ## DP: are a description of the patch.
+## DP: Try passing CFLAGS to configure of mpid/mpd.
+## DP: Not yet sent upstream
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+
+--- mpich-1.2.7.orig/mpid/ch_p4mpd/setup_ch_p4mpd
++++ mpich-1.2.7/mpid/ch_p4mpd/setup_ch_p4mpd
+@@ -329,7 +329,9 @@
+ echo "Configuring mpd subsystem..."
+ (cd mpid/mpd ; \
+     export VPATH ; export RSHCOMMAND ;\
+-    export CC ; export CLINKER ; export CFLAGS ; export CC_SHARED_OPT ; \
++    export CC ; export CLINKER ; \
++    CFLAGS="$USER_CFLAGS $P4_CFLAGS $CC_SHARED_OPT" \
++    export CFLAGS ; export CC_SHARED_OPT ; \
+     export SHAREDKIND ; \
+     $top_srcdir/mpid/mpd/configure --with-cc="$CC" \
+                 --with-opt="$OPTFLAGS" \
--- mpich-1.2.7.orig/debian/patches/25_use_posix_termios_interface.dpatch
+++ mpich-1.2.7/debian/patches/25_use_posix_termios_interface.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 25_use_posix_termios_interface.dpatch by Cyril Brulebois <kibi@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Stick to POSIX <termios.h> interface as suggested by Petr Salinger.
+## DP: That fixes the FTBFS on GNU/kFreeBSD.
+
+@DPATCH@
+--- mpich-1.2.7.orig/mpid/ch_p4/p4/lib/p4_secure.c
++++ mpich-1.2.7/mpid/ch_p4/p4/lib/p4_secure.c
+@@ -450,7 +450,7 @@
+ {
+     struct termios tty_new;
+
+-    if (ioctl(0, TIOCGETA, &tty_orig) < 0)
++    if (tcgetattr(0, &tty_orig) < 0)
+     {
+        fprintf(stderr, "tcgetattr failed: %s\n", strerror(errno));
+        return -1;
+@@ -460,7 +460,7 @@
+
+     tty_new.c_lflag &= ~(ECHO);
+
+-    if (ioctl(0, TIOCSETA, &tty_new) < 0)
++    if (tcsetattr(0, TCSANOW, &tty_new) < 0)
+     {
+        fprintf(stderr, "tcsetattr failed: %s\n", strerror(errno));
+        return -1;
+@@ -470,7 +470,7 @@
+
+ static int echo_on (void)
+ {
+-    if (ioctl(0, TIOCSETA, &tty_orig) < 0)
++    if (tcsetattr(0, TCSANOW, &tty_orig) < 0)
+     {
+        fprintf(stderr, "tcsetattr failed: %s\n", strerror(errno));
+        return -1;
--- mpich-1.2.7.orig/debian/patches/13_upstream_patchlevel1.dpatch
+++ mpich-1.2.7/debian/patches/13_upstream_patchlevel1.dpatch
@@ -0,0 +1,40134 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_upstream_patchlevel1.dpatch by Adam Powell <hazelsct@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Converted .diff.gz patch level 1 stuff into a .dpatch file.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+
+
+--- mpich-1.2.7.orig/KnownBugs
++++ mpich-1.2.7/KnownBugs
+@@ -1,6 +1,6 @@
+ This is a partial list of the known bugs and problems in MPICH. 
+ 
+-Current as of Release 1.2.6
++Current as of Release 1.2.7
+ 
+ General:
+ ========
+--- mpich-1.2.7.orig/Makefile.in
++++ mpich-1.2.7/Makefile.in
+@@ -20,7 +20,6 @@
+ FMPILIBNAME = f@MPILIBNAME@
+ 
+ AR          = @AR@
+-ARCMD       = @ARNAME@
+ RANLIB      = @RANLIB@
+ ### End User configurable options ###
+ 
+@@ -195,21 +194,35 @@
+ 	for lib in lib${MPILIBNAME}.a libp${MPILIBNAME}.a \
+             lib${FMPILIBNAME}.a ; do \
+ 	    if [ -s $$lib ] ; then \
+-	      ${top_srcdir}/util/makesharedlib -exceptobjs="farg.o farg90.o initf.o" -lib=$$lib -kind=@SHAREDKIND@ ; \
++	      ${top_srcdir}/util/makesharedlib -exceptobjs="farg.o _farg.o farg90.o _farg90.o initf.o _initf.o" \
++		  -lib=$$lib -kind=@SHAREDKIND@ ; \
+ 	    fi ; \
+ 	done ; \
+         if [ $(NOF77) = 0 ] ; then \
+ 	    if [ "@FLIBNAME@" != "@MPILIBNAME@" ] ; then \
+-	      ${top_srcdir}/util/makesharedlib -exceptobjs="farg.o farg90.o initf.o" -lib=lib@FLIBNAME@.a -kind=@SHAREDKIND@ ; \
+-	        ${ARCMD} x lib@FLIBNAME@.a farg.o initf.o 2>/dev/null ; \
+-	        ${AR} lib@FLIBNAME@farg.a farg.o initf.o ; \
++	      ${top_srcdir}/util/makesharedlib -exceptobjs="farg.o _farg.o farg90.o _farg90.o initf.o _initf.o" \
++		  -lib=lib@FLIBNAME@.a -kind=@SHAREDKIND@ ; \
++	        ${AR} x lib@FLIBNAME@.a farg.o initf.o 2>/dev/null ; \
++	        ${AR} cr lib@FLIBNAME@farg.a farg.o initf.o ; \
+ 	        rm -f farg.o initf.o ; \
++		if test "@HAS_WEAK_SYMBOLS@" = 0 ; then \
++	            ${AR} x libp${MPILIBNAME}.a _initf.o 2>/dev/null ; \
++		    ${AR} cr lib@FLIBNAME@farg.a _initf.o ; \
++	            rm -f _initf.o ; \
++		fi; \
+ 	    else \
+-	        ${ARCMD} x lib${MPILIBNAME}.a farg.o initf.o 2>/dev/null ; \
++	        ${AR} x lib${MPILIBNAME}.a farg.o initf.o 2>/dev/null ; \
+ 	        if [ -s farg.o -a -s initf.o ] ; then \
+-	            ${AR} lib${MPILIBNAME}farg.a farg.o initf.o ; \
++	            ${AR} cr lib${MPILIBNAME}farg.a farg.o initf.o ; \
+ 	            rm -f farg.o initf.o ; \
+                 fi ;\
++		if test "@HAS_WEAK_SYMBOLS@" = 0 ; then \
++		    ${AR} x libp${MPILIBNAME}.a _initf.o 2>/dev/null ; \
++	            if test -s _initf.o ; then \
++			${AR} cr lib@FLIBNAME@farg.a _initf.o ; \
++	        	rm -f _initf.o ; \
++		    fi; \
++		fi; \
+ 	    fi ; \
+ 	fi ; \
+ 	)
+@@ -347,6 +360,7 @@
+ 	CXXFLAGS="" ; export CXXFLAGS ; \
+ 	CXX="g++" ; export CXX ; \
+ 	CC="@CC@" ; export CC ; \
++	AR="$(ARCMD)" ; export AR ; \
+ 	ldir=`echo $(libdir) | sed -e 's%$(MPIR_HOME)/%%g'` ; \
+ 	if ${top_srcdir}/${CPP_DIR}/configure --with-mpich=.. \
+ 			--with-libopt=" " \
+@@ -574,7 +588,7 @@
+ 	    (cd util && rm -f chkmachine chkserv Makefile ) ; \
+ 	    (cd util/machines && \
+ 	    rm -f machines.IRIX* machines.sun* machines.solaris* \
+-	    machines.cray* machines.CRAY* machines.LINUX machines.rs6000 \
++	    machines.cray* machines.CRAY* machines.LINUX machines.rs600 \
+ 	    machines.alpha machines.hp* ) ; fi
+ 	-rm -f util/mympiinstall* util/mpichlib.conf
+ 	-if [ -d mpid/server -a -s mpid/server/Makefile ] ; then \
+--- mpich-1.2.7.orig/README
++++ mpich-1.2.7/README
+@@ -1,15 +1,17 @@
+ 
+ 		      Portable MPI Model Implementation
+ 
+-			 Version 1.2.7, June, 2005
++			 Version 1.2.7p1, November, 2005
+ 
+                                  David Ashton
+                                  Anthony Chan
+ 				  Bill Gropp
+                                   Rob Latham
+ 				  Rusty Lusk
++                                 Neill Miller
+                                    Rob Ross
+                                  Rajeev Thakur
++                                 Brian Toonen
+ 
+ 		  Mathematics and Computer Science Division
+ 			 Argonne National Laboratory
+@@ -21,8 +23,7 @@
+ area of parallel I/O.
+ 
+ This is only a bug fix release.  All new work is in MPICH2, available at
+-www.mcs.anl.gov/mpi/mpich2 .  In fact, this may be the last release
+-of MPICH1.  
++www.mcs.anl.gov/mpi/mpich2 .
+ 
+ The installation and user's manuals have been combined as of the
+ 1.2.3. release; in addition, device-specific versions are available,
+@@ -60,6 +61,8 @@
+ Systems on which we test frequently and which MPICH is known to run include
+ 
+ Linux for IA32 (several flavors)
++Linux for IA64
++Linux for Alpha
+ Solaris (both 32 bit and 64 bit)
+ 
+ MPICH has also been built on 
+@@ -154,9 +157,7 @@
+ 
+ Reporting Bugs:
+ 
+-If you have trouble, first try MPICH2 (www.mcs.anl.gov/mpi/mpich2) .
+-
+-If you need to use MPICH1, check the installation and user manuals (in 
++If you have trouble, first check the installation and user manuals (in 
+ mpich/doc/) .  Next, check the on-line bug list at
+ http://www.mcs.anl.gov/mpi/mpich .  Finally, if you are still having problems,
+ send
+--- mpich-1.2.7.orig/aclocal.m4
++++ mpich-1.2.7/aclocal.m4
+@@ -1712,9 +1712,9 @@
+ if test -z "$USERAR" ; then
+ case $1 in 
+    intelnx|paragon|i860) AR="ar860 crl" ; ARNAME="ar860" ; ARARGS="crl" ;;
+-   cm5) AR="ar cr" ; ARNAME="ar" ; ARARGS="cr"
++   cm5) AR="ar" ; ARNAME="ar" ; ARARGS="cr"
+    ;;
+-   meiko|solaris) AR="ar cr" ; ARNAME="ar" ; ARARGS="cr" 
++   meiko|solaris) AR="ar" ; ARNAME="ar" ; ARARGS="cr" 
+    ;;
+    ncube) AR="nar cr" ; ARNAME="nar" ; ARARGS="cr" ;;
+    *)
+@@ -1725,7 +1725,7 @@
+     ARNAME="ar"
+ fi
+ if test -z "$AR" ; then 
+-    AR="$ARNAME cr$ARLOCAL" ; ARARGS="cr$ARLOCAL" 
++    AR="$ARNAME" ; ARARGS="cr$ARLOCAL" 
+ fi
+ ])dnl
+ dnl --------------------------------------------------------
+@@ -2590,7 +2590,7 @@
+     AC_MSG_RESULT(no)
+     print_error "Error in creating test object for ranlib!"
+ else
+-    arcmd='$AR foo.a conftest.o >conftest.out 2>&1'
++    arcmd='$AR cr foo.a conftest.o >conftest.out 2>&1'
+     eval $arcmd
+     ranlibtest='$RANLIB foo.a >>conftest.out 2>&1'
+     if eval $ranlibtest ; then
+@@ -2662,7 +2662,7 @@
+ dnl Build the library
+ compileonly='${CC-cc} -c $CFLAGS conftest1.c >conftest.out 2>&1'
+ if eval $compileonly ; then 
+-    arcmd='$AR libfoo.a conftest1.o >conftest.out 2>&1'
++    arcmd='$AR cr libfoo.a conftest1.o >conftest.out 2>&1'
+     eval $arcmd
+     ranlibtest='$RANLIB libfoo.a >>conftest.out 2>&1'
+     if eval $ranlibtest ; then
+--- mpich-1.2.7.orig/buildmsg
++++ mpich-1.2.7/buildmsg
+@@ -10,7 +10,7 @@
+ romio-maint@mcs.anl.gov
+ 
+ With any bug report, please send
+-        The version of MPICH (e.g., 1.2.6)
++        The version of MPICH (e.g., 1.2.7)
+  
+ The output of running your program with the -mpiversion argument
+ (e.g., mpirun -np 1 a.out -mpiversion)
+--- mpich-1.2.7.orig/configure
++++ mpich-1.2.7/configure
+@@ -1889,6 +1889,71 @@
+ # we've identified the proper compiler etc, we'll try this 
+ # ranlib below; if it fails, we'll replace it with ':'
+ #
++# Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++if test -z "$ac_echo_n" ; then
++ac_echo_n=yes
++if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
++  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
++  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
++    ac_n= ac_c='
++' ac_t='	'
++  else
++    ac_n=-n ac_c= ac_t=
++  fi
++else
++  ac_n= ac_c='\c' ac_t=
++fi
++ac_echo_test=`echo foo 1>&1`
++if test -z "$ac_echo_test" ; then
++     print_error "Your sh shell does not handle the output redirection"
++     print_error "1>&1 correctly.  Configure will work around this problem,"
++     print_error "but you should report the problem to your vendor."
++fi
++
++fi
++if test -z "$ac_echo_test" -a 1 = 1 ; then
++echo $ac_n "checking for $ac_word""... $ac_c"
++else
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&1
++fi
++ac_prog_where=""
++if test -n "$AR"; then
++  ac_pg_AR="$AR" # Let the user override the test.
++else
++  ac_first_char=`expr "ar" : "\(.\)"`
++  # Use ac_word instead of ar in case the command has options on it.
++  if test "$ac_first_char" = "/" -a -x "$ac_word" ; then
++       ac_pg_AR=""
++       ac_prog_where=ar
++  else
++      IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++      for ac_dir in $PATH; do
++        test -z "$ac_dir" && ac_dir=.
++        if test -f $ac_dir/$ac_word; then
++          ac_pg_AR=""
++          ac_prog_where=$ac_dir/$ac_word
++          break
++        fi
++      done
++      IFS="$ac_save_ifs"
++  fi
++fi;AR="$ac_pg_AR"
++if test -n "$ac_prog_where" ; then
++  if test -z "$ac_echo_test" -a 1 = 1 ; then
++echo "$ac_t""found $ac_prog_where ($AR)"
++else
++echo "$ac_t""found $ac_prog_where ($AR)" 1>&1
++fi
++  
++else
++  if test -z "$ac_echo_test" -a 1 = 1 ; then
++echo "$ac_t""no"
++else
++echo "$ac_t""no" 1>&1
++fi
++fi
++
+ if test -z "$RANLIB" ; then
+     if test -z "$RANLIB"; then
+   # Extract the first word of `ranlib', so it can be a program name with args.
+@@ -1912,8 +1977,8 @@
+ # Problem: Using the ar_local option can cause low performance; not using it
+ # can cause failures.  Should we try to get disk space, and pick default 
+ # based on a guess about the available space?
+-AR="ar cr$AR_LOCAL"
+-ARCMD="ar"
++# Back when systems had small disks, we let AR be "ar crl" where "l" 
++# was defined as "local" (don't use /tmp for intermediate files)
+ # CPRP is the version of cp that accepts -r and -p arguments.
+ # See CRAY below
+ CPRP="cp"
+@@ -5389,9 +5454,9 @@
+ if test -z "$USERAR" ; then
+ case $CARCH in 
+    intelnx|paragon|i860) AR="ar860 crl" ; ARNAME="ar860" ; ARARGS="crl" ;;
+-   cm5) AR="ar cr" ; ARNAME="ar" ; ARARGS="cr"
++   cm5) AR="ar" ; ARNAME="ar" ; ARARGS="cr"
+    ;;
+-   meiko|solaris) AR="ar cr" ; ARNAME="ar" ; ARARGS="cr" 
++   meiko|solaris) AR="ar" ; ARNAME="ar" ; ARARGS="cr" 
+    ;;
+    ncube) AR="nar cr" ; ARNAME="nar" ; ARARGS="cr" ;;
+    *)
+@@ -5478,10 +5543,9 @@
+     ARNAME="ar"
+ fi
+ if test -z "$AR" ; then 
+-    AR="$ARNAME cr$ARLOCAL" ; ARARGS="cr$ARLOCAL" 
++    AR="$ARNAME" ; ARARGS="cr$ARLOCAL" 
+ fi
+ 
+-
+ #
+ # Check to see if the compilers work at all (you'd be surprised!)
+ if test -z "$ac_echo_n" ; then
+@@ -13692,7 +13756,7 @@
+ fi
+     print_error "Error in creating test object for ranlib!"
+ else
+-    arcmd='$AR foo.a conftest.o >conftest.out 2>&1'
++    arcmd='$AR cr foo.a conftest.o >conftest.out 2>&1'
+     eval $arcmd
+     ranlibtest='$RANLIB foo.a >>conftest.out 2>&1'
+     if eval $ranlibtest ; then
+@@ -13794,7 +13858,7 @@
+ fi
+ compileonly='${CC-cc} -c $CFLAGS conftest1.c >conftest.out 2>&1'
+ if eval $compileonly ; then 
+-    arcmd='$AR libfoo.a conftest1.o >conftest.out 2>&1'
++    arcmd='$AR cr libfoo.a conftest1.o >conftest.out 2>&1'
+     eval $arcmd
+     ranlibtest='$RANLIB libfoo.a >>conftest.out 2>&1'
+     if eval $ranlibtest ; then
+@@ -13831,6 +13895,9 @@
+ # path)
+ # Remove any arguments from the string AR
+ ARTEST=`expr "$AR" : "\(.*\) "`
++if test -z "$ARTEST" ; then 
++    ARTEST=$AR
++fi
+ # Extract the first word of "$ARTEST", so it can be a program name with args.
+ set dummy $ARTEST; ac_word=$2
+ if test -z "$ac_echo_n" ; then
+@@ -16164,9 +16231,9 @@
+     ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.c -o conftest $LIBS 1>&2 2>&2'
+ fi
+ if eval $ac_compile ; then
+-    # Create the library (AR includes the cr options)
++    # Create the library
+     rm -f lib$MPILIBNAME.a
+-    ${AR} lib$MPILIBNAME.a conftest.o
++    ${AR} cr lib$MPILIBNAME.a conftest.o
+     ${RANLIB} lib$MPILIBNAME.a
+     rm -f conftest*
+     # create the main program
+@@ -16844,7 +16911,6 @@
+ includebuild_dir='$includebuild_dir'
+ sysconfdir='$sysconfdir'
+ GXXTRIAL='$GXXTRIAL'
+-ARNAME='$ARNAME'
+ HAVE_NO_C_CONST='$HAVE_NO_C_CONST'
+ EXEEXT='$EXEEXT'
+ CPP='$CPP'
+@@ -16981,7 +17047,7 @@
+   echo creating $file
+   rm -f $file
+   echo "# Generated automatically from `echo $file|sed 's|.*/||'`.in by configure." > $file
+-cat $top_srcdir/${file}.in | sed -e "
++  sed -e "
+ $prsub
+ $extrasub
+ s%@CASE_SENSITIVE@%$CASE_SENSITIVE%g
+@@ -17015,7 +17081,6 @@
+ s%@includebuild_dir@%$includebuild_dir%g
+ s%@sysconfdir@%$sysconfdir%g
+ s%@GXXTRIAL@%$GXXTRIAL%g
+-s%@ARNAME@%$ARNAME%g
+ s%@HAVE_NO_C_CONST@%$HAVE_NO_C_CONST%g
+ s%@EXEEXT@%$EXEEXT%g
+ s%@CPP@%$CPP%g
+@@ -17023,7 +17088,7 @@
+ s%@CXXENABLE@%$CXXENABLE%g
+ s%@CC_SHARED_OPT@%$CC_SHARED_OPT%g
+ s%@CC_SHARED_OPT_FOR_TV@%$CC_SHARED_OPT_FOR_TV%g
+-s%@CXXFLAGS_FOR_SHARED@%$CXXFLAGS_FOR_SHARED%g" | sed -e "
++s%@CXXFLAGS_FOR_SHARED@%$CXXFLAGS_FOR_SHARED%g
+ s%@SHAREDKIND@%$SHAREDKIND%g
+ s%@SHAREDKIND_FOR_TV@%$SHAREDKIND_FOR_TV%g
+ s%@MPI_STATUS_SIZE@%$MPI_STATUS_SIZE%g
+@@ -17065,7 +17130,7 @@
+ s%@DEFAULT_MACHINE@%$DEFAULT_MACHINE%g
+ s%@DEVCFLAGS@%$DEVCFLAGS%g
+ s%@DEVCFILES@%$DEVCFILES%g
+-s%@DEVOFILES@%$DEVOFILES%g" | sed -e "
++s%@DEVOFILES@%$DEVOFILES%g
+ s%@DEV_DEFS@%$DEV_DEFS%g
+ s%@DEVICE@%$DEVICE%g
+ s%@DEVICE_MAKE_INCLUDE@%$DEVICE_MAKE_INCLUDE%g
+@@ -17107,7 +17172,7 @@
+ s%@NEWTESTDIRS@%$NEWTESTDIRS%g
+ s%@OPTFLAGS@%$OPTFLAGS%g
+ s%@OPTFLAGSC@%$OPTFLAGSC%g
+-s%@OPTFLAGSF@%$OPTFLAGSF%g" | sed -e "
++s%@OPTFLAGSF@%$OPTFLAGSF%g
+ s%@P4_ARCH@%$P4_ARCH%g
+ s%@P4_DIR@%$P4_DIR%g
+ s%@RHS_COMMAND@%$RHS_COMMAND%g
+@@ -17126,7 +17191,7 @@
+ s%@MPE_OPTS@%$MPE_OPTS%g
+ s%@MPI_INTRA@%$MPI_INTRA%g
+ s%@LIBS@%$LIBS%g
+-s%@DEFS@%-DHAVE_CONFIG_H%" >> $file
++s%@DEFS@%-DHAVE_CONFIG_H%" $top_srcdir/${file}.in >> $file
+ fi; done
+ 
+ CONFIG_HEADERS=${CONFIG_HEADERS-"mpichconf.h"}
+--- mpich-1.2.7.orig/configure.in
++++ mpich-1.2.7/configure.in
+@@ -1564,6 +1564,7 @@
+ # we've identified the proper compiler etc, we'll try this 
+ # ranlib below; if it fails, we'll replace it with ':'
+ #
++PAC_PROGRAM_CHECK(AR,ar)
+ if test -z "$RANLIB" ; then
+     AC_PROG_RANLIB
+ fi
+@@ -1571,8 +1572,8 @@
+ # Problem: Using the ar_local option can cause low performance; not using it
+ # can cause failures.  Should we try to get disk space, and pick default 
+ # based on a guess about the available space?
+-AR="ar cr$AR_LOCAL"
+-ARCMD="ar"
++# Back when systems had small disks, we let AR be "ar crl" where "l" 
++# was defined as "local" (don't use /tmp for intermediate files)
+ # CPRP is the version of cp that accepts -r and -p arguments.
+ # See CRAY below
+ CPRP="cp"
+@@ -1993,7 +1994,6 @@
+ fi
+ #
+ PAC_GET_AR($CARCH)
+-AC_SUBST(ARNAME)
+ #
+ # Check to see if the compilers work at all (you'd be surprised!)
+ AC_COMPILE_CHECK([whether compiler works],,,compile_check=yes,compile_check=no)
+@@ -3210,6 +3210,9 @@
+ # path)
+ # Remove any arguments from the string AR
+ ARTEST=`expr "$AR" : "\(.*\) "`
++if test -z "$ARTEST" ; then 
++    ARTEST=$AR
++fi
+ PAC_PROGRAM_CHECK(ARFOUND,$ARTEST,1,,ARLOC)
+ if test -z "$ARLOC" ; then 
+     # Check for /usr/ccs/bin/ar ; Solaris likes to hide anything remotely
+@@ -3503,9 +3506,9 @@
+     ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.c -o conftest $LIBS 1>&AC_FD_CC 2>&AC_FD_CC'
+ fi
+ if eval $ac_compile ; then
+-    # Create the library (AR includes the cr options)
++    # Create the library
+     rm -f lib$MPILIBNAME.a
+-    ${AR} lib$MPILIBNAME.a conftest.o
++    ${AR} cr lib$MPILIBNAME.a conftest.o
+     ${RANLIB} lib$MPILIBNAME.a
+     rm -f conftest*
+     # create the main program
+--- mpich-1.2.7.orig/www.index
++++ mpich-1.2.7/www.index
+@@ -26,11 +26,11 @@
+ man:+MPI_Sendrecv_replace++MPI_Sendrecv_replace++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Sendrecv_replace.html#MPI_Sendrecv_replace
+ man:+MPI_Ssend++MPI_Ssend++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Ssend.html#MPI_Ssend
+ man:+MPI_Ssend_init++MPI_Ssend_init++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Ssend_init.html#MPI_Ssend_init
+-man:+MPI_Start++MPI_Start++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Start.html#MPI_Start
+ man:+MPI_Startall++MPI_Startall++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Startall.html#MPI_Startall
+-man:+MPI_Test++MPI_Test++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Test.html#MPI_Test
++man:+MPI_Start++MPI_Start++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Start.html#MPI_Start
+ man:+MPI_Testall++MPI_Testall++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Testall.html#MPI_Testall
+ man:+MPI_Testany++MPI_Testany++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Testany.html#MPI_Testany
++man:+MPI_Test++MPI_Test++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Test.html#MPI_Test
+ man:+MPI_Test_cancelled++MPI_Test_cancelled++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Test_cancelled.html#MPI_Test_cancelled
+ man:+MPI_Testsome++MPI_Testsome++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Testsome.html#MPI_Testsome
+ man:+MPI_Type_commit++MPI_Type_commit++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Type_commit.html#MPI_Type_commit
+@@ -46,9 +46,9 @@
+ man:+MPI_Type_ub++MPI_Type_ub++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Type_ub.html#MPI_Type_ub
+ man:+MPI_Type_vector++MPI_Type_vector++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Type_vector.html#MPI_Type_vector
+ man:+MPI_Unpack++MPI_Unpack++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Unpack.html#MPI_Unpack
+-man:+MPI_Wait++MPI_Wait++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Wait.html#MPI_Wait
+ man:+MPI_Waitall++MPI_Waitall++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Waitall.html#MPI_Waitall
+ man:+MPI_Waitany++MPI_Waitany++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Waitany.html#MPI_Waitany
++man:+MPI_Wait++MPI_Wait++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Wait.html#MPI_Wait
+ man:+MPI_Waitsome++MPI_Waitsome++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Waitsome.html#MPI_Waitsome
+ man:+MPI_Abort++MPI_Abort++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Abort.html#MPI_Abort
+ man:+MPI_Error_class++MPI_Error_class++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Error_class.html#MPI_Error_class
+@@ -69,6 +69,7 @@
+ man:+MPI_Attr_delete++MPI_Attr_delete++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Attr_delete.html#MPI_Attr_delete
+ man:+MPI_Attr_get++MPI_Attr_get++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Attr_get.html#MPI_Attr_get
+ man:+MPI_Attr_put++MPI_Attr_put++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Attr_put.html#MPI_Attr_put
++man:+MPI_Comm_compare++MPI_Comm_compare++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Comm_compare.html#MPI_Comm_compare
+ man:+MPI_Comm_create++MPI_Comm_create++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Comm_create.html#MPI_Comm_create
+ man:+MPI_Comm_dup++MPI_Comm_dup++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Comm_dup.html#MPI_Comm_dup
+ man:+MPI_Comm_free++MPI_Comm_free++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Comm_free.html#MPI_Comm_free
+@@ -81,8 +82,8 @@
+ man:+MPI_Comm_size++MPI_Comm_size++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Comm_size.html#MPI_Comm_size
+ man:+MPI_Comm_split++MPI_Comm_split++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Comm_split.html#MPI_Comm_split
+ man:+MPI_Comm_test_inter++MPI_Comm_test_inter++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Comm_test_inter.html#MPI_Comm_test_inter
+-man:+MPI_Comm_compare++MPI_Comm_compare++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Comm_compare.html#MPI_Comm_compare
+ man:+MPI_DUP_FN++MPI_DUP_FN++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_DUP_FN.html#MPI_DUP_FN
++man:+MPI_Group_compare++MPI_Group_compare++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Group_compare.html#MPI_Group_compare
+ man:+MPI_Group_difference++MPI_Group_difference++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Group_difference.html#MPI_Group_difference
+ man:+MPI_Group_excl++MPI_Group_excl++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Group_excl.html#MPI_Group_excl
+ man:+MPI_Group_free++MPI_Group_free++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Group_free.html#MPI_Group_free
+@@ -94,11 +95,10 @@
+ man:+MPI_Group_size++MPI_Group_size++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Group_size.html#MPI_Group_size
+ man:+MPI_Group_translate_ranks++MPI_Group_translate_ranks++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Group_translate_ranks.html#MPI_Group_translate_ranks
+ man:+MPI_Group_union++MPI_Group_union++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Group_union.html#MPI_Group_union
+-man:+MPI_Group_compare++MPI_Group_compare++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Group_compare.html#MPI_Group_compare
+ man:+MPI_Intercomm_create++MPI_Intercomm_create++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Intercomm_create.html#MPI_Intercomm_create
+ man:+MPI_Intercomm_merge++MPI_Intercomm_merge++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Intercomm_merge.html#MPI_Intercomm_merge
+-man:+MPI_Keyval_free++MPI_Keyval_free++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Keyval_free.html#MPI_Keyval_free
+ man:+MPI_Keyval_create++MPI_Keyval_create++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Keyval_create.html#MPI_Keyval_create
++man:+MPI_Keyval_free++MPI_Keyval_free++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Keyval_free.html#MPI_Keyval_free
+ man:+MPI_NULL_COPY_FN++MPI_NULL_COPY_FN++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_NULL_COPY_FN.html#MPI_NULL_COPY_FN
+ man:+MPI_NULL_DELETE_FN++MPI_NULL_DELETE_FN++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_NULL_DELETE_FN.html#MPI_NULL_DELETE_FN
+ man:+MPI_Allgather++MPI_Allgather++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Allgather.html#MPI_Allgather
+@@ -119,18 +119,18 @@
+ man:+MPI_Scatterv++MPI_Scatterv++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Scatterv.html#MPI_Scatterv
+ man:+MPI_Cart_coords++MPI_Cart_coords++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Cart_coords.html#MPI_Cart_coords
+ man:+MPI_Cart_create++MPI_Cart_create++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Cart_create.html#MPI_Cart_create
++man:+MPI_Cartdim_get++MPI_Cartdim_get++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Cartdim_get.html#MPI_Cartdim_get
+ man:+MPI_Cart_get++MPI_Cart_get++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Cart_get.html#MPI_Cart_get
+ man:+MPI_Cart_map++MPI_Cart_map++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Cart_map.html#MPI_Cart_map
+ man:+MPI_Cart_rank++MPI_Cart_rank++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Cart_rank.html#MPI_Cart_rank
+ man:+MPI_Cart_shift++MPI_Cart_shift++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Cart_shift.html#MPI_Cart_shift
+ man:+MPI_Cart_sub++MPI_Cart_sub++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Cart_sub.html#MPI_Cart_sub
+-man:+MPI_Cartdim_get++MPI_Cartdim_get++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Cartdim_get.html#MPI_Cartdim_get
+ man:+MPI_Dims_create++MPI_Dims_create++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Dims_create.html#MPI_Dims_create
++man:+MPI_Graph_create++MPI_Graph_create++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Graph_create.html#MPI_Graph_create
++man:+MPI_Graphdims_get++MPI_Graphdims_get++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Graphdims_get.html#MPI_Graphdims_get
+ man:+MPI_Graph_get++MPI_Graph_get++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Graph_get.html#MPI_Graph_get
+ man:+MPI_Graph_map++MPI_Graph_map++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Graph_map.html#MPI_Graph_map
+ man:+MPI_Graph_neighbors++MPI_Graph_neighbors++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Graph_neighbors.html#MPI_Graph_neighbors
+-man:+MPI_Graph_create++MPI_Graph_create++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Graph_create.html#MPI_Graph_create
+-man:+MPI_Graphdims_get++MPI_Graphdims_get++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Graphdims_get.html#MPI_Graphdims_get
+ man:+MPI_Graph_neighbors_count++MPI_Graph_neighbors_count++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Graph_neighbors_count.html#MPI_Graph_neighbors_count
+ man:+MPI_Topo_test++MPI_Topo_test++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Topo_test.html#MPI_Topo_test
+ man:+MPI_Pcontrol++MPI_Pcontrol++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Pcontrol.html#MPI_Pcontrol
+@@ -154,24 +154,24 @@
+ man:+MPIO_Request_f2c++MPIO_Request_f2c++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPIO_Request_f2c.html#MPIO_Request_f2c
+ man:+MPIO_Test++MPIO_Test++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPIO_Test.html#MPIO_Test
+ man:+MPIO_Wait++MPIO_Wait++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPIO_Wait.html#MPIO_Wait
+-man:+MPI_File_iread++MPI_File_iread++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_iread.html#MPI_File_iread
+ man:+MPI_File_iread_at++MPI_File_iread_at++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_iread_at.html#MPI_File_iread_at
++man:+MPI_File_iread++MPI_File_iread++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_iread.html#MPI_File_iread
+ man:+MPI_File_iread_shared++MPI_File_iread_shared++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_iread_shared.html#MPI_File_iread_shared
+-man:+MPI_File_iwrite++MPI_File_iwrite++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_iwrite.html#MPI_File_iwrite
+ man:+MPI_File_iwrite_at++MPI_File_iwrite_at++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_iwrite_at.html#MPI_File_iwrite_at
++man:+MPI_File_iwrite++MPI_File_iwrite++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_iwrite.html#MPI_File_iwrite
+ man:+MPI_File_iwrite_shared++MPI_File_iwrite_shared++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_iwrite_shared.html#MPI_File_iwrite_shared
+ man:+MPI_File_open++MPI_File_open++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_open.html#MPI_File_open
+ man:+MPI_File_preallocate++MPI_File_preallocate++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_preallocate.html#MPI_File_preallocate
+ man:+MPI_File_read_at_all_begin++MPI_File_read_at_all_begin++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_read_at_all_begin.html#MPI_File_read_at_all_begin
+ man:+MPI_File_read_at_all_end++MPI_File_read_at_all_end++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_read_at_all_end.html#MPI_File_read_at_all_end
+-man:+MPI_File_read++MPI_File_read++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_read.html#MPI_File_read
+-man:+MPI_File_read_all++MPI_File_read_all++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_read_all.html#MPI_File_read_all
+ man:+MPI_File_read_all_begin++MPI_File_read_all_begin++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_read_all_begin.html#MPI_File_read_all_begin
++man:+MPI_File_read_all++MPI_File_read_all++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_read_all.html#MPI_File_read_all
+ man:+MPI_File_read_all_end++MPI_File_read_all_end++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_read_all_end.html#MPI_File_read_all_end
+-man:+MPI_File_read_at++MPI_File_read_at++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_read_at.html#MPI_File_read_at
+ man:+MPI_File_read_at_all++MPI_File_read_at_all++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_read_at_all.html#MPI_File_read_at_all
+-man:+MPI_File_read_ordered++MPI_File_read_ordered++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_read_ordered.html#MPI_File_read_ordered
++man:+MPI_File_read_at++MPI_File_read_at++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_read_at.html#MPI_File_read_at
++man:+MPI_File_read++MPI_File_read++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_read.html#MPI_File_read
+ man:+MPI_File_read_ordered_begin++MPI_File_read_ordered_begin++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_read_ordered_begin.html#MPI_File_read_ordered_begin
++man:+MPI_File_read_ordered++MPI_File_read_ordered++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_read_ordered.html#MPI_File_read_ordered
+ man:+MPI_File_read_ordered_end++MPI_File_read_ordered_end++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_read_ordered_end.html#MPI_File_read_ordered_end
+ man:+MPI_File_read_shared++MPI_File_read_shared++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_read_shared.html#MPI_File_read_shared
+ man:+MPI_Register_datarep++MPI_Register_datarep++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Register_datarep.html#MPI_Register_datarep
+@@ -184,14 +184,14 @@
+ man:+MPI_File_set_view++MPI_File_set_view++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_set_view.html#MPI_File_set_view
+ man:+MPI_File_write_at_all_begin++MPI_File_write_at_all_begin++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_write_at_all_begin.html#MPI_File_write_at_all_begin
+ man:+MPI_File_write_at_all_end++MPI_File_write_at_all_end++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_write_at_all_end.html#MPI_File_write_at_all_end
+-man:+MPI_File_write++MPI_File_write++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_write.html#MPI_File_write
+-man:+MPI_File_write_all++MPI_File_write_all++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_write_all.html#MPI_File_write_all
+ man:+MPI_File_write_all_begin++MPI_File_write_all_begin++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_write_all_begin.html#MPI_File_write_all_begin
++man:+MPI_File_write_all++MPI_File_write_all++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_write_all.html#MPI_File_write_all
+ man:+MPI_File_write_all_end++MPI_File_write_all_end++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_write_all_end.html#MPI_File_write_all_end
+-man:+MPI_File_write_at++MPI_File_write_at++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_write_at.html#MPI_File_write_at
+ man:+MPI_File_write_at_all++MPI_File_write_at_all++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_write_at_all.html#MPI_File_write_at_all
+-man:+MPI_File_write_ordered++MPI_File_write_ordered++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_write_ordered.html#MPI_File_write_ordered
++man:+MPI_File_write_at++MPI_File_write_at++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_write_at.html#MPI_File_write_at
++man:+MPI_File_write++MPI_File_write++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_write.html#MPI_File_write
+ man:+MPI_File_write_ordered_begin++MPI_File_write_ordered_begin++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_write_ordered_begin.html#MPI_File_write_ordered_begin
++man:+MPI_File_write_ordered++MPI_File_write_ordered++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_write_ordered.html#MPI_File_write_ordered
+ man:+MPI_File_write_ordered_end++MPI_File_write_ordered_end++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_write_ordered_end.html#MPI_File_write_ordered_end
+ man:+MPI_File_write_shared++MPI_File_write_shared++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_File_write_shared.html#MPI_File_write_shared
+ man:+MPI_Info_c2f++MPI_Info_c2f++++man+http://www-unix.mcs.anl.gov/mpi/www/www3/MPI_Info_c2f.html#MPI_Info_c2f
+--- mpich-1.2.7.orig/www/index.html
++++ mpich-1.2.7/www/index.html
+@@ -4,20 +4,20 @@
+ <H1>Web pages for MPI and MPE</H1>
+ <H2>MPI Commands</H2>
+ <TABLE>
+-<TR>	<TD><LI><A HREF="www1/Jumpshots.html">Jumpshots</A>
++<TR>	<TD><LI><A HREF="www1/chp4_servs.html">chp4_servs</A>
+ 	<TD><LI><A HREF="www1/mpiCC.html">mpiCC</A>
+ 	<TD><LI><A HREF="www1/mpireconfig.html">mpireconfig</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www1/MPI.html">MPI</A>
+-	<TD><LI><A HREF="www1/mpicc.html">mpicc</A>
++<TR>	<TD><LI><A HREF="www1/cleanipcs.html">cleanipcs</A>
++	<TD><LI><A HREF="www1/mpif77.html">mpif77</A>
+ 	<TD><LI><A HREF="www1/mpirun.html">mpirun</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www1/chp4_servs.html">chp4_servs</A>
+-	<TD><LI><A HREF="www1/mpif77.html">mpif77</A>
++<TR>	<TD><LI><A HREF="www1/Jumpshots.html">Jumpshots</A>
++	<TD><LI><A HREF="www1/mpif90.html">mpif90</A>
+ 	<TD><LI><A HREF="www1/tstmachines.html">tstmachines</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www1/cleanipcs.html">cleanipcs</A>
+-	<TD><LI><A HREF="www1/mpif90.html">mpif90</A>
++<TR>	<TD><LI><A HREF="www1/mpicc.html">mpicc</A>
++	<TD><LI><A HREF="www1/MPI.html">MPI</A>
+ 	<TD></TR>
+ <TR>	<TD><LI><A HREF="www1/mpiCC.html">mpiCC</A>
+ 	<TD><LI><A HREF="www1/mpiman.html">mpiman</A>
+@@ -26,31 +26,15 @@
+ <H2>MPI Routines</H2>
+ <TABLE>
+ <TR>	<TD><LI><A HREF="www3/Constants.html">Constants</A>
+-	<TD><LI><A HREF="www3/MPI_File_open.html">MPI_File_open</A>
+-	<TD><LI><A HREF="www3/MPI_Initialized.html">MPI_Initialized</A>
+-</TR>
+-<TR>	<TD><LI><A HREF="www3/MPIO_Request_c2f.html">MPIO_Request_c2f</A>
+-	<TD><LI><A HREF="www3/MPI_File_preallocate.html">MPI_File_preallocate</A>
+-	<TD><LI><A HREF="www3/MPI_Int2handle.html">MPI_Int2handle</A>
+-</TR>
+-<TR>	<TD><LI><A HREF="www3/MPIO_Request_f2c.html">MPIO_Request_f2c</A>
+-	<TD><LI><A HREF="www3/MPI_File_read.html">MPI_File_read</A>
+-	<TD><LI><A HREF="www3/MPI_Intercomm_create.html">MPI_Intercomm_create</A>
+-</TR>
+-<TR>	<TD><LI><A HREF="www3/MPIO_Test.html">MPIO_Test</A>
+ 	<TD><LI><A HREF="www3/MPI_File_read_all.html">MPI_File_read_all</A>
+-	<TD><LI><A HREF="www3/MPI_Intercomm_merge.html">MPI_Intercomm_merge</A>
+-</TR>
+-<TR>	<TD><LI><A HREF="www3/MPIO_Wait.html">MPIO_Wait</A>
+-	<TD><LI><A HREF="www3/MPI_File_read_all_begin.html">MPI_File_read_all_begin</A>
+ 	<TD><LI><A HREF="www3/MPI_Iprobe.html">MPI_Iprobe</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Abort.html">MPI_Abort</A>
+-	<TD><LI><A HREF="www3/MPI_File_read_all_end.html">MPI_File_read_all_end</A>
++	<TD><LI><A HREF="www3/MPI_File_read_at_all_begin.html">MPI_File_read_at_all_begin</A>
+ 	<TD><LI><A HREF="www3/MPI_Irecv.html">MPI_Irecv</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Address.html">MPI_Address</A>
+-	<TD><LI><A HREF="www3/MPI_File_read_at.html">MPI_File_read_at</A>
++	<TD><LI><A HREF="www3/MPI_File_read_at_all_end.html">MPI_File_read_at_all_end</A>
+ 	<TD><LI><A HREF="www3/MPI_Irsend.html">MPI_Irsend</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Allgather.html">MPI_Allgather</A>
+@@ -58,23 +42,23 @@
+ 	<TD><LI><A HREF="www3/MPI_Isend.html">MPI_Isend</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Allgatherv.html">MPI_Allgatherv</A>
+-	<TD><LI><A HREF="www3/MPI_File_read_at_all_begin.html">MPI_File_read_at_all_begin</A>
++	<TD><LI><A HREF="www3/MPI_File_read_at.html">MPI_File_read_at</A>
+ 	<TD><LI><A HREF="www3/MPI_Issend.html">MPI_Issend</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Allreduce.html">MPI_Allreduce</A>
+-	<TD><LI><A HREF="www3/MPI_File_read_at_all_end.html">MPI_File_read_at_all_end</A>
++	<TD><LI><A HREF="www3/MPI_File_read.html">MPI_File_read</A>
+ 	<TD><LI><A HREF="www3/MPI_Keyval_create.html">MPI_Keyval_create</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Alltoall.html">MPI_Alltoall</A>
+-	<TD><LI><A HREF="www3/MPI_File_read_ordered.html">MPI_File_read_ordered</A>
++	<TD><LI><A HREF="www3/MPI_File_read_ordered_begin.html">MPI_File_read_ordered_begin</A>
+ 	<TD><LI><A HREF="www3/MPI_Keyval_free.html">MPI_Keyval_free</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Alltoallv.html">MPI_Alltoallv</A>
+-	<TD><LI><A HREF="www3/MPI_File_read_ordered_begin.html">MPI_File_read_ordered_begin</A>
++	<TD><LI><A HREF="www3/MPI_File_read_ordered_end.html">MPI_File_read_ordered_end</A>
+ 	<TD><LI><A HREF="www3/MPI_NULL_COPY_FN.html">MPI_NULL_COPY_FN</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Attr_delete.html">MPI_Attr_delete</A>
+-	<TD><LI><A HREF="www3/MPI_File_read_ordered_end.html">MPI_File_read_ordered_end</A>
++	<TD><LI><A HREF="www3/MPI_File_read_ordered.html">MPI_File_read_ordered</A>
+ 	<TD><LI><A HREF="www3/MPI_NULL_DELETE_FN.html">MPI_NULL_DELETE_FN</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Attr_get.html">MPI_Attr_get</A>
+@@ -87,326 +71,342 @@
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Barrier.html">MPI_Barrier</A>
+ 	<TD><LI><A HREF="www3/MPI_File_seek_shared.html">MPI_File_seek_shared</A>
+-	<TD><LI><A HREF="www3/MPI_Pack.html">MPI_Pack</A>
++	<TD><LI><A HREF="www3/MPIO_Request_c2f.html">MPIO_Request_c2f</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Bcast.html">MPI_Bcast</A>
+ 	<TD><LI><A HREF="www3/MPI_File_set_atomicity.html">MPI_File_set_atomicity</A>
+-	<TD><LI><A HREF="www3/MPI_Pack_size.html">MPI_Pack_size</A>
++	<TD><LI><A HREF="www3/MPIO_Request_f2c.html">MPIO_Request_f2c</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Bsend.html">MPI_Bsend</A>
+ 	<TD><LI><A HREF="www3/MPI_File_set_errhandler.html">MPI_File_set_errhandler</A>
+-	<TD><LI><A HREF="www3/MPI_Pcontrol.html">MPI_Pcontrol</A>
++	<TD><LI><A HREF="www3/MPIO_Test.html">MPIO_Test</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Bsend_init.html">MPI_Bsend_init</A>
+ 	<TD><LI><A HREF="www3/MPI_File_set_info.html">MPI_File_set_info</A>
+-	<TD><LI><A HREF="www3/MPI_Probe.html">MPI_Probe</A>
++	<TD><LI><A HREF="www3/MPIO_Wait.html">MPIO_Wait</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Buffer_attach.html">MPI_Buffer_attach</A>
+ 	<TD><LI><A HREF="www3/MPI_File_set_size.html">MPI_File_set_size</A>
+-	<TD><LI><A HREF="www3/MPI_Recv.html">MPI_Recv</A>
++	<TD><LI><A HREF="www3/MPI_Pack.html">MPI_Pack</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Buffer_detach.html">MPI_Buffer_detach</A>
+ 	<TD><LI><A HREF="www3/MPI_File_set_view.html">MPI_File_set_view</A>
+-	<TD><LI><A HREF="www3/MPI_Recv_init.html">MPI_Recv_init</A>
+-</TR>
+-<TR>	<TD><LI><A HREF="www3/MPI_CHAR.html">MPI_CHAR</A>
+-	<TD><LI><A HREF="www3/MPI_File_sync.html">MPI_File_sync</A>
+-	<TD><LI><A HREF="www3/MPI_Reduce.html">MPI_Reduce</A>
++	<TD><LI><A HREF="www3/MPI_Pack_size.html">MPI_Pack_size</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Cancel.html">MPI_Cancel</A>
+-	<TD><LI><A HREF="www3/MPI_File_write.html">MPI_File_write</A>
+-	<TD><LI><A HREF="www3/MPI_Reduce_scatter.html">MPI_Reduce_scatter</A>
++	<TD><LI><A HREF="www3/MPI_File_sync.html">MPI_File_sync</A>
++	<TD><LI><A HREF="www3/MPI_Pcontrol.html">MPI_Pcontrol</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Cart_coords.html">MPI_Cart_coords</A>
+-	<TD><LI><A HREF="www3/MPI_File_write_all.html">MPI_File_write_all</A>
+-	<TD><LI><A HREF="www3/MPI_Register_datarep.html">MPI_Register_datarep</A>
++	<TD><LI><A HREF="www3/MPI_File_write_all_begin.html">MPI_File_write_all_begin</A>
++	<TD><LI><A HREF="www3/MPI_Probe.html">MPI_Probe</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Cart_create.html">MPI_Cart_create</A>
+-	<TD><LI><A HREF="www3/MPI_File_write_all_begin.html">MPI_File_write_all_begin</A>
+-	<TD><LI><A HREF="www3/MPI_Request_c2f.html">MPI_Request_c2f</A>
++	<TD><LI><A HREF="www3/MPI_File_write_all_end.html">MPI_File_write_all_end</A>
++	<TD><LI><A HREF="www3/MPI_Recv.html">MPI_Recv</A>
++</TR>
++<TR>	<TD><LI><A HREF="www3/MPI_Cartdim_get.html">MPI_Cartdim_get</A>
++	<TD><LI><A HREF="www3/MPI_File_write_all.html">MPI_File_write_all</A>
++	<TD><LI><A HREF="www3/MPI_Recv_init.html">MPI_Recv_init</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Cart_get.html">MPI_Cart_get</A>
+-	<TD><LI><A HREF="www3/MPI_File_write_all_end.html">MPI_File_write_all_end</A>
+-	<TD><LI><A HREF="www3/MPI_Request_free.html">MPI_Request_free</A>
++	<TD><LI><A HREF="www3/MPI_File_write_at_all_begin.html">MPI_File_write_at_all_begin</A>
++	<TD><LI><A HREF="www3/MPI_Reduce.html">MPI_Reduce</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Cart_map.html">MPI_Cart_map</A>
+-	<TD><LI><A HREF="www3/MPI_File_write_at.html">MPI_File_write_at</A>
+-	<TD><LI><A HREF="www3/MPI_Rsend.html">MPI_Rsend</A>
++	<TD><LI><A HREF="www3/MPI_File_write_at_all_end.html">MPI_File_write_at_all_end</A>
++	<TD><LI><A HREF="www3/MPI_Reduce_scatter.html">MPI_Reduce_scatter</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Cart_rank.html">MPI_Cart_rank</A>
+ 	<TD><LI><A HREF="www3/MPI_File_write_at_all.html">MPI_File_write_at_all</A>
+-	<TD><LI><A HREF="www3/MPI_Rsend_init.html">MPI_Rsend_init</A>
++	<TD><LI><A HREF="www3/MPI_Register_datarep.html">MPI_Register_datarep</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Cart_shift.html">MPI_Cart_shift</A>
+-	<TD><LI><A HREF="www3/MPI_File_write_at_all_begin.html">MPI_File_write_at_all_begin</A>
+-	<TD><LI><A HREF="www3/MPI_Scan.html">MPI_Scan</A>
++	<TD><LI><A HREF="www3/MPI_File_write_at.html">MPI_File_write_at</A>
++	<TD><LI><A HREF="www3/MPI_Request_c2f.html">MPI_Request_c2f</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Cart_sub.html">MPI_Cart_sub</A>
+-	<TD><LI><A HREF="www3/MPI_File_write_at_all_end.html">MPI_File_write_at_all_end</A>
+-	<TD><LI><A HREF="www3/MPI_Scatter.html">MPI_Scatter</A>
++	<TD><LI><A HREF="www3/MPI_File_write.html">MPI_File_write</A>
++	<TD><LI><A HREF="www3/MPI_Request_free.html">MPI_Request_free</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www3/MPI_Cartdim_get.html">MPI_Cartdim_get</A>
+-	<TD><LI><A HREF="www3/MPI_File_write_ordered.html">MPI_File_write_ordered</A>
+-	<TD><LI><A HREF="www3/MPI_Scatterv.html">MPI_Scatterv</A>
++<TR>	<TD><LI><A HREF="www3/MPI_CHAR.html">MPI_CHAR</A>
++	<TD><LI><A HREF="www3/MPI_File_write_ordered_begin.html">MPI_File_write_ordered_begin</A>
++	<TD><LI><A HREF="www3/MPI_Rsend.html">MPI_Rsend</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Comm_compare.html">MPI_Comm_compare</A>
+-	<TD><LI><A HREF="www3/MPI_File_write_ordered_begin.html">MPI_File_write_ordered_begin</A>
+-	<TD><LI><A HREF="www3/MPI_Send.html">MPI_Send</A>
++	<TD><LI><A HREF="www3/MPI_File_write_ordered_end.html">MPI_File_write_ordered_end</A>
++	<TD><LI><A HREF="www3/MPI_Rsend_init.html">MPI_Rsend_init</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Comm_create.html">MPI_Comm_create</A>
+-	<TD><LI><A HREF="www3/MPI_File_write_ordered_end.html">MPI_File_write_ordered_end</A>
+-	<TD><LI><A HREF="www3/MPI_Send_init.html">MPI_Send_init</A>
++	<TD><LI><A HREF="www3/MPI_File_write_ordered.html">MPI_File_write_ordered</A>
++	<TD><LI><A HREF="www3/MPI_Scan.html">MPI_Scan</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Comm_dup.html">MPI_Comm_dup</A>
+ 	<TD><LI><A HREF="www3/MPI_File_write_shared.html">MPI_File_write_shared</A>
+-	<TD><LI><A HREF="www3/MPI_Sendrecv.html">MPI_Sendrecv</A>
++	<TD><LI><A HREF="www3/MPI_Scatter.html">MPI_Scatter</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Comm_free.html">MPI_Comm_free</A>
+-	<TD><LI><A HREF="www3/MPI_Finalize.html">MPI_Finalize</A>
+-	<TD><LI><A HREF="www3/MPI_Sendrecv_replace.html">MPI_Sendrecv_replace</A>
++	<TD><LI><A HREF="www3/MPI_Finalized.html">MPI_Finalized</A>
++	<TD><LI><A HREF="www3/MPI_Scatterv.html">MPI_Scatterv</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Comm_get_name.html">MPI_Comm_get_name</A>
+-	<TD><LI><A HREF="www3/MPI_Finalized.html">MPI_Finalized</A>
+-	<TD><LI><A HREF="www3/MPI_Ssend.html">MPI_Ssend</A>
++	<TD><LI><A HREF="www3/MPI_Finalize.html">MPI_Finalize</A>
++	<TD><LI><A HREF="www3/MPI_Send.html">MPI_Send</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Comm_group.html">MPI_Comm_group</A>
+ 	<TD><LI><A HREF="www3/MPI_Gather.html">MPI_Gather</A>
+-	<TD><LI><A HREF="www3/MPI_Ssend_init.html">MPI_Ssend_init</A>
++	<TD><LI><A HREF="www3/MPI_Send_init.html">MPI_Send_init</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Comm_rank.html">MPI_Comm_rank</A>
+ 	<TD><LI><A HREF="www3/MPI_Gatherv.html">MPI_Gatherv</A>
+-	<TD><LI><A HREF="www3/MPI_Start.html">MPI_Start</A>
++	<TD><LI><A HREF="www3/MPI_Sendrecv.html">MPI_Sendrecv</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Comm_remote_group.html">MPI_Comm_remote_group</A>
+ 	<TD><LI><A HREF="www3/MPI_Get_count.html">MPI_Get_count</A>
+-	<TD><LI><A HREF="www3/MPI_Startall.html">MPI_Startall</A>
++	<TD><LI><A HREF="www3/MPI_Sendrecv_replace.html">MPI_Sendrecv_replace</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Comm_remote_size.html">MPI_Comm_remote_size</A>
+ 	<TD><LI><A HREF="www3/MPI_Get_elements.html">MPI_Get_elements</A>
+-	<TD><LI><A HREF="www3/MPI_Status_c2f.html">MPI_Status_c2f</A>
++	<TD><LI><A HREF="www3/MPI_Ssend.html">MPI_Ssend</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Comm_set_name.html">MPI_Comm_set_name</A>
+ 	<TD><LI><A HREF="www3/MPI_Get_processor_name.html">MPI_Get_processor_name</A>
+-	<TD><LI><A HREF="www3/MPI_Status_set_cancelled.html">MPI_Status_set_cancelled</A>
++	<TD><LI><A HREF="www3/MPI_Ssend_init.html">MPI_Ssend_init</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Comm_size.html">MPI_Comm_size</A>
+ 	<TD><LI><A HREF="www3/MPI_Get_version.html">MPI_Get_version</A>
+-	<TD><LI><A HREF="www3/MPI_Status_set_elements.html">MPI_Status_set_elements</A>
++	<TD><LI><A HREF="www3/MPI_Startall.html">MPI_Startall</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Comm_split.html">MPI_Comm_split</A>
+ 	<TD><LI><A HREF="www3/MPI_Graph_create.html">MPI_Graph_create</A>
+-	<TD><LI><A HREF="www3/MPI_Test.html">MPI_Test</A>
++	<TD><LI><A HREF="www3/MPI_Start.html">MPI_Start</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Comm_test_inter.html">MPI_Comm_test_inter</A>
++	<TD><LI><A HREF="www3/MPI_Graphdims_get.html">MPI_Graphdims_get</A>
++	<TD><LI><A HREF="www3/MPI_Status_c2f.html">MPI_Status_c2f</A>
++</TR>
++<TR>	<TD><LI><A HREF="www3/MPI_Dims_create.html">MPI_Dims_create</A>
+ 	<TD><LI><A HREF="www3/MPI_Graph_get.html">MPI_Graph_get</A>
+-	<TD><LI><A HREF="www3/MPI_Test_cancelled.html">MPI_Test_cancelled</A>
++	<TD><LI><A HREF="www3/MPI_Status_set_cancelled.html">MPI_Status_set_cancelled</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_DUP_FN.html">MPI_DUP_FN</A>
+ 	<TD><LI><A HREF="www3/MPI_Graph_map.html">MPI_Graph_map</A>
+-	<TD><LI><A HREF="www3/MPI_Testall.html">MPI_Testall</A>
+-</TR>
+-<TR>	<TD><LI><A HREF="www3/MPI_Dims_create.html">MPI_Dims_create</A>
+-	<TD><LI><A HREF="www3/MPI_Graph_neighbors.html">MPI_Graph_neighbors</A>
+-	<TD><LI><A HREF="www3/MPI_Testany.html">MPI_Testany</A>
++	<TD><LI><A HREF="www3/MPI_Status_set_elements.html">MPI_Status_set_elements</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Errhandler_create.html">MPI_Errhandler_create</A>
+ 	<TD><LI><A HREF="www3/MPI_Graph_neighbors_count.html">MPI_Graph_neighbors_count</A>
+-	<TD><LI><A HREF="www3/MPI_Testsome.html">MPI_Testsome</A>
++	<TD><LI><A HREF="www3/MPI_Testall.html">MPI_Testall</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Errhandler_free.html">MPI_Errhandler_free</A>
+-	<TD><LI><A HREF="www3/MPI_Graphdims_get.html">MPI_Graphdims_get</A>
+-	<TD><LI><A HREF="www3/MPI_Topo_test.html">MPI_Topo_test</A>
++	<TD><LI><A HREF="www3/MPI_Graph_neighbors.html">MPI_Graph_neighbors</A>
++	<TD><LI><A HREF="www3/MPI_Testany.html">MPI_Testany</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Errhandler_get.html">MPI_Errhandler_get</A>
+ 	<TD><LI><A HREF="www3/MPI_Group_compare.html">MPI_Group_compare</A>
+-	<TD><LI><A HREF="www3/MPI_Type_commit.html">MPI_Type_commit</A>
++	<TD><LI><A HREF="www3/MPI_Test_cancelled.html">MPI_Test_cancelled</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Errhandler_set.html">MPI_Errhandler_set</A>
+ 	<TD><LI><A HREF="www3/MPI_Group_difference.html">MPI_Group_difference</A>
+-	<TD><LI><A HREF="www3/MPI_Type_contiguous.html">MPI_Type_contiguous</A>
++	<TD><LI><A HREF="www3/MPI_Test.html">MPI_Test</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Error_class.html">MPI_Error_class</A>
+ 	<TD><LI><A HREF="www3/MPI_Group_excl.html">MPI_Group_excl</A>
+-	<TD><LI><A HREF="www3/MPI_Type_create_darray.html">MPI_Type_create_darray</A>
++	<TD><LI><A HREF="www3/MPI_Testsome.html">MPI_Testsome</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_Error_string.html">MPI_Error_string</A>
+ 	<TD><LI><A HREF="www3/MPI_Group_free.html">MPI_Group_free</A>
+-	<TD><LI><A HREF="www3/MPI_Type_create_indexed_block.html">MPI_Type_create_indexed_block</A>
++	<TD><LI><A HREF="www3/MPI_Topo_test.html">MPI_Topo_test</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_c2f.html">MPI_File_c2f</A>
+ 	<TD><LI><A HREF="www3/MPI_Group_incl.html">MPI_Group_incl</A>
+-	<TD><LI><A HREF="www3/MPI_Type_create_subarray.html">MPI_Type_create_subarray</A>
++	<TD><LI><A HREF="www3/MPI_Type_commit.html">MPI_Type_commit</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_close.html">MPI_File_close</A>
+ 	<TD><LI><A HREF="www3/MPI_Group_intersection.html">MPI_Group_intersection</A>
+-	<TD><LI><A HREF="www3/MPI_Type_extent.html">MPI_Type_extent</A>
++	<TD><LI><A HREF="www3/MPI_Type_contiguous.html">MPI_Type_contiguous</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_delete.html">MPI_File_delete</A>
+ 	<TD><LI><A HREF="www3/MPI_Group_range_excl.html">MPI_Group_range_excl</A>
+-	<TD><LI><A HREF="www3/MPI_Type_free.html">MPI_Type_free</A>
++	<TD><LI><A HREF="www3/MPI_Type_create_darray.html">MPI_Type_create_darray</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_f2c.html">MPI_File_f2c</A>
+ 	<TD><LI><A HREF="www3/MPI_Group_range_incl.html">MPI_Group_range_incl</A>
+-	<TD><LI><A HREF="www3/MPI_Type_get_contents.html">MPI_Type_get_contents</A>
++	<TD><LI><A HREF="www3/MPI_Type_create_indexed_block.html">MPI_Type_create_indexed_block</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_get_amode.html">MPI_File_get_amode</A>
+ 	<TD><LI><A HREF="www3/MPI_Group_rank.html">MPI_Group_rank</A>
+-	<TD><LI><A HREF="www3/MPI_Type_get_envelope.html">MPI_Type_get_envelope</A>
++	<TD><LI><A HREF="www3/MPI_Type_create_subarray.html">MPI_Type_create_subarray</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_get_atomicity.html">MPI_File_get_atomicity</A>
+ 	<TD><LI><A HREF="www3/MPI_Group_size.html">MPI_Group_size</A>
+-	<TD><LI><A HREF="www3/MPI_Type_hindexed.html">MPI_Type_hindexed</A>
++	<TD><LI><A HREF="www3/MPI_Type_extent.html">MPI_Type_extent</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_get_byte_offset.html">MPI_File_get_byte_offset</A>
+ 	<TD><LI><A HREF="www3/MPI_Group_translate_ranks.html">MPI_Group_translate_ranks</A>
+-	<TD><LI><A HREF="www3/MPI_Type_hvector.html">MPI_Type_hvector</A>
++	<TD><LI><A HREF="www3/MPI_Type_free.html">MPI_Type_free</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_get_errhandler.html">MPI_File_get_errhandler</A>
+ 	<TD><LI><A HREF="www3/MPI_Group_union.html">MPI_Group_union</A>
+-	<TD><LI><A HREF="www3/MPI_Type_indexed.html">MPI_Type_indexed</A>
++	<TD><LI><A HREF="www3/MPI_Type_get_contents.html">MPI_Type_get_contents</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_get_group.html">MPI_File_get_group</A>
+ 	<TD><LI><A HREF="www3/MPI_Ibsend.html">MPI_Ibsend</A>
+-	<TD><LI><A HREF="www3/MPI_Type_lb.html">MPI_Type_lb</A>
++	<TD><LI><A HREF="www3/MPI_Type_get_envelope.html">MPI_Type_get_envelope</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_get_info.html">MPI_File_get_info</A>
+ 	<TD><LI><A HREF="www3/MPI_Info_c2f.html">MPI_Info_c2f</A>
+-	<TD><LI><A HREF="www3/MPI_Type_size.html">MPI_Type_size</A>
++	<TD><LI><A HREF="www3/MPI_Type_hindexed.html">MPI_Type_hindexed</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_get_position.html">MPI_File_get_position</A>
+ 	<TD><LI><A HREF="www3/MPI_Info_create.html">MPI_Info_create</A>
+-	<TD><LI><A HREF="www3/MPI_Type_struct.html">MPI_Type_struct</A>
++	<TD><LI><A HREF="www3/MPI_Type_hvector.html">MPI_Type_hvector</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_get_position_shared.html">MPI_File_get_position_shared</A>
+ 	<TD><LI><A HREF="www3/MPI_Info_delete.html">MPI_Info_delete</A>
+-	<TD><LI><A HREF="www3/MPI_Type_ub.html">MPI_Type_ub</A>
++	<TD><LI><A HREF="www3/MPI_Type_indexed.html">MPI_Type_indexed</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_get_size.html">MPI_File_get_size</A>
+ 	<TD><LI><A HREF="www3/MPI_Info_dup.html">MPI_Info_dup</A>
+-	<TD><LI><A HREF="www3/MPI_Type_vector.html">MPI_Type_vector</A>
++	<TD><LI><A HREF="www3/MPI_Type_lb.html">MPI_Type_lb</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_get_type_extent.html">MPI_File_get_type_extent</A>
+ 	<TD><LI><A HREF="www3/MPI_Info_f2c.html">MPI_Info_f2c</A>
+-	<TD><LI><A HREF="www3/MPI_Unpack.html">MPI_Unpack</A>
++	<TD><LI><A HREF="www3/MPI_Type_size.html">MPI_Type_size</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_get_view.html">MPI_File_get_view</A>
+ 	<TD><LI><A HREF="www3/MPI_Info_free.html">MPI_Info_free</A>
+-	<TD><LI><A HREF="www3/MPI_Wait.html">MPI_Wait</A>
++	<TD><LI><A HREF="www3/MPI_Type_struct.html">MPI_Type_struct</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www3/MPI_File_iread.html">MPI_File_iread</A>
++<TR>	<TD><LI><A HREF="www3/MPI_File_iread_at.html">MPI_File_iread_at</A>
+ 	<TD><LI><A HREF="www3/MPI_Info_get.html">MPI_Info_get</A>
+-	<TD><LI><A HREF="www3/MPI_Waitall.html">MPI_Waitall</A>
++	<TD><LI><A HREF="www3/MPI_Type_ub.html">MPI_Type_ub</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www3/MPI_File_iread_at.html">MPI_File_iread_at</A>
++<TR>	<TD><LI><A HREF="www3/MPI_File_iread.html">MPI_File_iread</A>
+ 	<TD><LI><A HREF="www3/MPI_Info_get_nkeys.html">MPI_Info_get_nkeys</A>
+-	<TD><LI><A HREF="www3/MPI_Waitany.html">MPI_Waitany</A>
++	<TD><LI><A HREF="www3/MPI_Type_vector.html">MPI_Type_vector</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_iread_shared.html">MPI_File_iread_shared</A>
+ 	<TD><LI><A HREF="www3/MPI_Info_get_nthkey.html">MPI_Info_get_nthkey</A>
+-	<TD><LI><A HREF="www3/MPI_Waitsome.html">MPI_Waitsome</A>
++	<TD><LI><A HREF="www3/MPI_Unpack.html">MPI_Unpack</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www3/MPI_File_iwrite.html">MPI_File_iwrite</A>
++<TR>	<TD><LI><A HREF="www3/MPI_File_iwrite_at.html">MPI_File_iwrite_at</A>
+ 	<TD><LI><A HREF="www3/MPI_Info_get_valuelen.html">MPI_Info_get_valuelen</A>
+-	<TD><LI><A HREF="www3/MPI_Wtick.html">MPI_Wtick</A>
++	<TD><LI><A HREF="www3/MPI_Waitall.html">MPI_Waitall</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www3/MPI_File_iwrite_at.html">MPI_File_iwrite_at</A>
++<TR>	<TD><LI><A HREF="www3/MPI_File_iwrite.html">MPI_File_iwrite</A>
+ 	<TD><LI><A HREF="www3/MPI_Info_set.html">MPI_Info_set</A>
+-	<TD><LI><A HREF="www3/MPI_Wtime.html">MPI_Wtime</A>
++	<TD><LI><A HREF="www3/MPI_Waitany.html">MPI_Waitany</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_iwrite_shared.html">MPI_File_iwrite_shared</A>
+ 	<TD><LI><A HREF="www3/MPI_Init.html">MPI_Init</A>
+-	<TD></TR>
++	<TD><LI><A HREF="www3/MPI_Wait.html">MPI_Wait</A>
++</TR>
+ <TR>	<TD><LI><A HREF="www3/MPI_File_open.html">MPI_File_open</A>
++	<TD><LI><A HREF="www3/MPI_Initialized.html">MPI_Initialized</A>
++	<TD><LI><A HREF="www3/MPI_Waitsome.html">MPI_Waitsome</A>
++</TR>
++<TR>	<TD><LI><A HREF="www3/MPI_File_preallocate.html">MPI_File_preallocate</A>
+ 	<TD><LI><A HREF="www3/MPI_Init_thread.html">MPI_Init_thread</A>
++	<TD><LI><A HREF="www3/MPI_Wtick.html">MPI_Wtick</A>
++</TR>
++<TR>	<TD><LI><A HREF="www3/MPI_File_read_all_begin.html">MPI_File_read_all_begin</A>
++	<TD><LI><A HREF="www3/MPI_Int2handle.html">MPI_Int2handle</A>
++	<TD><LI><A HREF="www3/MPI_Wtime.html">MPI_Wtime</A>
++</TR>
++<TR>	<TD><LI><A HREF="www3/MPI_File_read_all_end.html">MPI_File_read_all_end</A>
++	<TD><LI><A HREF="www3/MPI_Intercomm_create.html">MPI_Intercomm_create</A>
++	<TD></TR>
++<TR>	<TD><LI><A HREF="www3/MPI_File_read_all.html">MPI_File_read_all</A>
++	<TD><LI><A HREF="www3/MPI_Intercomm_merge.html">MPI_Intercomm_merge</A>
+ 	<TD></TR>
+ </TABLE>
+ <H2>MPE Routines</H2>
+ <TABLE>
+-<TR>	<TD><LI><A HREF="www4/CLOG_Finalize.html">CLOG_Finalize</A>
+-	<TD><LI><A HREF="www4/MPE_CaptureFile.html">MPE_CaptureFile</A>
+-	<TD><LI><A HREF="www4/MPE_Iget_mouse_press.html">MPE_Iget_mouse_press</A>
+-</TR>
+-<TR>	<TD><LI><A HREF="www4/CLOG_Init.html">CLOG_Init</A>
++<TR>	<TD><LI><A HREF="www4/CLOG_commtype.html">CLOG_commtype</A>
+ 	<TD><LI><A HREF="www4/MPE_Close_graphics.html">MPE_Close_graphics</A>
+-	<TD><LI><A HREF="www4/MPE_Init_log.html">MPE_Init_log</A>
++	<TD><LI><A HREF="www4/MPE_Initialized_logging.html">MPE_Initialized_logging</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www4/CLOG_Output.html">CLOG_Output</A>
++<TR>	<TD><LI><A HREF="www4/CLOG_cput.html">CLOG_cput</A>
+ 	<TD><LI><A HREF="www4/MPE_Comm_global_rank.html">MPE_Comm_global_rank</A>
+-	<TD><LI><A HREF="www4/MPE_Initialized_logging.html">MPE_Initialized_logging</A>
++	<TD><LI><A HREF="www4/MPE_Init_log.html">MPE_Init_log</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www4/CLOG_commtype.html">CLOG_commtype</A>
++<TR>	<TD><LI><A HREF="www4/CLOG_csync.html">CLOG_csync</A>
+ 	<TD><LI><A HREF="www4/MPE_Counter_create.html">MPE_Counter_create</A>
+-	<TD><LI><A HREF="www4/MPE_Line_thickness.html">MPE_Line_thickness</A>
++	<TD><LI><A HREF="www4/MPE_IO_Stdout_to_file.html">MPE_IO_Stdout_to_file</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www4/CLOG_cput.html">CLOG_cput</A>
++<TR>	<TD><LI><A HREF="www4/CLOG_Finalize.html">CLOG_Finalize</A>
+ 	<TD><LI><A HREF="www4/MPE_Counter_free.html">MPE_Counter_free</A>
+-	<TD><LI><A HREF="www4/MPE_Log_event.html">MPE_Log_event</A>
++	<TD><LI><A HREF="www4/MPE_Line_thickness.html">MPE_Line_thickness</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www4/CLOG_csync.html">CLOG_csync</A>
++<TR>	<TD><LI><A HREF="www4/CLOG_get_new_event.html">CLOG_get_new_event</A>
+ 	<TD><LI><A HREF="www4/MPE_Counter_nxtval.html">MPE_Counter_nxtval</A>
+-	<TD><LI><A HREF="www4/MPE_Log_get_event_number.html">MPE_Log_get_event_number</A>
++	<TD><LI><A HREF="www4/MPE_Log_event.html">MPE_Log_event</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www4/CLOG_get_new_event.html">CLOG_get_new_event</A>
++<TR>	<TD><LI><A HREF="www4/CLOG_get_new_state.html">CLOG_get_new_state</A>
+ 	<TD><LI><A HREF="www4/MPE_Decomp1d.html">MPE_Decomp1d</A>
+-	<TD><LI><A HREF="www4/MPE_Log_receive.html">MPE_Log_receive</A>
++	<TD><LI><A HREF="www4/MPE_Log_get_event_number.html">MPE_Log_get_event_number</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www4/CLOG_get_new_state.html">CLOG_get_new_state</A>
++<TR>	<TD><LI><A HREF="www4/CLOG_init_buffers.html">CLOG_init_buffers</A>
+ 	<TD><LI><A HREF="www4/MPE_Describe_event.html">MPE_Describe_event</A>
+-	<TD><LI><A HREF="www4/MPE_Log_send.html">MPE_Log_send</A>
++	<TD><LI><A HREF="www4/MPE_Log_receive.html">MPE_Log_receive</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www4/CLOG_init_buffers.html">CLOG_init_buffers</A>
++<TR>	<TD><LI><A HREF="www4/CLOG_Init.html">CLOG_Init</A>
+ 	<TD><LI><A HREF="www4/MPE_Describe_state.html">MPE_Describe_state</A>
+-	<TD><LI><A HREF="www4/MPE_Make_color_array.html">MPE_Make_color_array</A>
++	<TD><LI><A HREF="www4/MPE_Log_send.html">MPE_Log_send</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www4/CLOG_mergelogs.html">CLOG_mergelogs</A>
+ 	<TD><LI><A HREF="www4/MPE_Draw_circle.html">MPE_Draw_circle</A>
+-	<TD><LI><A HREF="www4/MPE_Num_colors.html">MPE_Num_colors</A>
++	<TD><LI><A HREF="www4/MPE_Make_color_array.html">MPE_Make_color_array</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www4/CLOG_mergend.html">CLOG_mergend</A>
+ 	<TD><LI><A HREF="www4/MPE_Draw_line.html">MPE_Draw_line</A>
+-	<TD><LI><A HREF="www4/MPE_Open_graphics.html">MPE_Open_graphics</A>
++	<TD><LI><A HREF="www4/MPE_Num_colors.html">MPE_Num_colors</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www4/CLOG_msgtype.html">CLOG_msgtype</A>
+ 	<TD><LI><A HREF="www4/MPE_Draw_logic.html">MPE_Draw_logic</A>
+-	<TD><LI><A HREF="www4/MPE_Print_datatype_pack_action.html">MPE_Print_datatype_pack_action</A>
++	<TD><LI><A HREF="www4/MPE_Open_graphics.html">MPE_Open_graphics</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www4/CLOG_newbuff.html">CLOG_newbuff</A>
+ 	<TD><LI><A HREF="www4/MPE_Draw_point.html">MPE_Draw_point</A>
+-	<TD><LI><A HREF="www4/MPE_Print_datatype_unpack_action.html">MPE_Print_datatype_unpack_action</A>
++	<TD><LI><A HREF="www4/MPE_Print_datatype_pack_action.html">MPE_Print_datatype_pack_action</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www4/CLOG_nodebuffer2disk.html">CLOG_nodebuffer2disk</A>
+ 	<TD><LI><A HREF="www4/MPE_Draw_points.html">MPE_Draw_points</A>
++	<TD><LI><A HREF="www4/MPE_Print_datatype_unpack_action.html">MPE_Print_datatype_unpack_action</A>
++</TR>
++<TR>	<TD><LI><A HREF="www4/CLOG_Output.html">CLOG_Output</A>
++	<TD><LI><A HREF="www4/MPE_Draw_string.html">MPE_Draw_string</A>
+ 	<TD><LI><A HREF="www4/MPE_ReturnTags.html">MPE_ReturnTags</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www4/CLOG_procbuf.html">CLOG_procbuf</A>
+-	<TD><LI><A HREF="www4/MPE_Draw_string.html">MPE_Draw_string</A>
++	<TD><LI><A HREF="www4/MPE_Fill_circle.html">MPE_Fill_circle</A>
+ 	<TD><LI><A HREF="www4/MPE_Seq_begin.html">MPE_Seq_begin</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www4/CLOG_reclen.html">CLOG_reclen</A>
+-	<TD><LI><A HREF="www4/MPE_Fill_circle.html">MPE_Fill_circle</A>
++	<TD><LI><A HREF="www4/MPE_Fill_rectangle.html">MPE_Fill_rectangle</A>
+ 	<TD><LI><A HREF="www4/MPE_Seq_end.html">MPE_Seq_end</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www4/CLOG_rectype.html">CLOG_rectype</A>
+-	<TD><LI><A HREF="www4/MPE_Fill_rectangle.html">MPE_Fill_rectangle</A>
++	<TD><LI><A HREF="www4/MPE_Finish_log.html">MPE_Finish_log</A>
+ 	<TD><LI><A HREF="www4/MPE_Start_log.html">MPE_Start_log</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www4/CLOG_reinit_buff.html">CLOG_reinit_buff</A>
+-	<TD><LI><A HREF="www4/MPE_Finish_log.html">MPE_Finish_log</A>
++	<TD><LI><A HREF="www4/MPE_Get_mouse_press.html">MPE_Get_mouse_press</A>
+ 	<TD><LI><A HREF="www4/MPE_Stop_log.html">MPE_Stop_log</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="www4/CLOG_treesetup.html">CLOG_treesetup</A>
+ 	<TD><LI><A HREF="www4/MPE_GetTags.html">MPE_GetTags</A>
+ 	<TD><LI><A HREF="www4/MPE_TagsEnd.html">MPE_TagsEnd</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www4/MPE.html">MPE</A>
+-	<TD><LI><A HREF="www4/MPE_Get_mouse_press.html">MPE_Get_mouse_press</A>
++<TR>	<TD><LI><A HREF="www4/MPE_Add_RGB_color.html">MPE_Add_RGB_color</A>
++	<TD><LI><A HREF="www4/MPE.html">MPE</A>
+ 	<TD><LI><A HREF="www4/MPE_Update.html">MPE_Update</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="www4/MPE_Add_RGB_color.html">MPE_Add_RGB_color</A>
+-	<TD><LI><A HREF="www4/MPE_IO_Stdout_to_file.html">MPE_IO_Stdout_to_file</A>
+-	<TD></TR>
+ <TR>	<TD><LI><A HREF="www4/MPE_CaptureFile.html">MPE_CaptureFile</A>
+ 	<TD><LI><A HREF="www4/MPE_Iget_mouse_press.html">MPE_Iget_mouse_press</A>
+ 	<TD></TR>
++<TR>	<TD><LI><A HREF="www4/MPE_Close_graphics.html">MPE_Close_graphics</A>
++	<TD><LI><A HREF="www4/MPE_Initialized_logging.html">MPE_Initialized_logging</A>
++	<TD></TR>
+ </TABLE>
+ </BODY>
+--- mpich-1.2.7.orig/www/www1/index.html
++++ mpich-1.2.7/www/www1/index.html
+@@ -3,14 +3,14 @@
+ <BODY BGCOLOR="FFFFFF">
+ <H1>MPICH Commands</H1>
+ <MENU>
+-<LI><A HREF="Jumpshots.html">Jumpshots</A>
+-<LI><A HREF="MPI.html">MPI</A>
+ <LI><A HREF="chp4_servs.html">chp4_servs</A>
+ <LI><A HREF="cleanipcs.html">cleanipcs</A>
+-<LI><A HREF="mpiCC.html">mpiCC</A>
++<LI><A HREF="Jumpshots.html">Jumpshots</A>
+ <LI><A HREF="mpicc.html">mpicc</A>
++<LI><A HREF="mpiCC.html">mpiCC</A>
+ <LI><A HREF="mpif77.html">mpif77</A>
+ <LI><A HREF="mpif90.html">mpif90</A>
++<LI><A HREF="MPI.html">MPI</A>
+ <LI><A HREF="mpiman.html">mpiman</A>
+ <LI><A HREF="mpireconfig.html">mpireconfig</A>
+ <LI><A HREF="mpirun.html">mpirun</A>
+--- mpich-1.2.7.orig/www/www3/MPI_File_iread.html
++++ mpich-1.2.7/www/www3/MPI_File_iread.html
+@@ -12,8 +12,8 @@
+ #ifdef HAVE_MPI_GREQUEST
+ #include "mpiu_greq.h"
+ 
+-int MPI_File_iread(MPI_File mpi_fh, void *buf, int count, 
+-                  MPI_Datatype datatype, MPIO_Request *request)
++#if defined(HAVE_WINDOWS_H) && defined(USE_WIN_THREADED_IO)
++typedef struct iread_args
+ </PRE>
+ <H2>Input Parameters</H2>
+ <DL><DT><B>fh </B> <DD> file handle (handle)
+--- mpich-1.2.7.orig/www/www3/MPI_File_iread_at.html
++++ mpich-1.2.7/www/www3/MPI_File_iread_at.html
+@@ -11,9 +11,9 @@
+ <PRE>
+ #ifdef HAVE_MPI_GREQUEST
+ #include "mpiu_greq.h"
+-int MPI_File_iread_at(MPI_File mpi_fh, MPI_Offset offset, void *buf,
+-                      int count, MPI_Datatype datatype, 
+-                      MPIO_Request *request)
++
++#if defined(HAVE_WINDOWS_H) && defined(USE_WIN_THREADED_IO)
++typedef struct iread_at_args
+ </PRE>
+ <H2>Input Parameters</H2>
+ <DL><DT><B>fh </B> <DD> file handle (handle)
+--- mpich-1.2.7.orig/www/www3/MPI_File_iread_shared.html
++++ mpich-1.2.7/www/www3/MPI_File_iread_shared.html
+@@ -12,8 +12,8 @@
+ #ifdef HAVE_MPI_GREQUEST
+ #include "mpiu_greq.h"
+ 
+-int MPI_File_iread_shared(MPI_File mpi_fh, void *buf, int count, 
+-                        MPI_Datatype datatype, MPIO_Request *request)
++#if defined(HAVE_WINDOWS_H) && defined(USE_WIN_THREADED_IO)
++typedef struct iread_shared_args
+ </PRE>
+ <H2>Input Parameters</H2>
+ <DL><DT><B>fh </B> <DD> file handle (handle)
+--- mpich-1.2.7.orig/www/www3/MPI_File_iwrite.html
++++ mpich-1.2.7/www/www3/MPI_File_iwrite.html
+@@ -12,8 +12,8 @@
+ #ifdef HAVE_MPI_GREQUEST
+ #include "mpiu_greq.h"
+ 
+-int MPI_File_iwrite(MPI_File mpi_fh, void *buf, int count, 
+-                   MPI_Datatype datatype, MPIO_Request *request)
++#if defined(HAVE_WINDOWS_H) && defined(USE_WIN_THREADED_IO)
++typedef struct iwrite_args
+ </PRE>
+ <H2>Input Parameters</H2>
+ <DL><DT><B>fh </B> <DD> file handle (handle)
+--- mpich-1.2.7.orig/www/www3/MPI_File_iwrite_at.html
++++ mpich-1.2.7/www/www3/MPI_File_iwrite_at.html
+@@ -12,9 +12,8 @@
+ #ifdef HAVE_MPI_GREQUEST
+ #include "mpiu_greq.h"
+ 
+-int MPI_File_iwrite_at(MPI_File mpi_fh, MPI_Offset offset, void *buf,
+-                       int count, MPI_Datatype datatype, 
+-                       MPIO_Request *request)
++#if defined(HAVE_WINDOWS_H) && defined(USE_WIN_THREADED_IO)
++typedef struct iwrite_at_args
+ </PRE>
+ <H2>Input Parameters</H2>
+ <DL><DT><B>fh </B> <DD> file handle (handle)
+--- mpich-1.2.7.orig/www/www3/MPI_File_iwrite_shared.html
++++ mpich-1.2.7/www/www3/MPI_File_iwrite_shared.html
+@@ -12,8 +12,8 @@
+ #ifdef HAVE_MPI_GREQUEST
+ #include "mpiu_greq.h"
+ 
+-int MPI_File_iwrite_shared(MPI_File mpi_fh, void *buf, int count, 
+-                         MPI_Datatype datatype, MPIO_Request *request)
++#if defined(HAVE_WINDOWS_H) && defined(USE_WIN_THREADED_IO)
++typedef struct iwrite_shared_args
+ </PRE>
+ <H2>Input Parameters</H2>
+ <DL><DT><B>fh </B> <DD> file handle (handle)
+--- mpich-1.2.7.orig/www/www3/index.html
++++ mpich-1.2.7/www/www3/index.html
+@@ -4,35 +4,19 @@
+ <H1>MPI Routines</H1>
+ <TABLE>
+ <TR>	<TD><LI><A HREF="Constants.html">Constants</A>
+-	<TD><LI><A HREF="MPI_File_iwrite_shared.html">MPI_File_iwrite_shared</A>
+-	<TD><LI><A HREF="MPI_Init.html">MPI_Init</A>
+-</TR>
+-<TR>	<TD><LI><A HREF="MPIO_Request_c2f.html">MPIO_Request_c2f</A>
+-	<TD><LI><A HREF="MPI_File_open.html">MPI_File_open</A>
+-	<TD><LI><A HREF="MPI_Init_thread.html">MPI_Init_thread</A>
+-</TR>
+-<TR>	<TD><LI><A HREF="MPIO_Request_f2c.html">MPIO_Request_f2c</A>
+-	<TD><LI><A HREF="MPI_File_preallocate.html">MPI_File_preallocate</A>
+-	<TD><LI><A HREF="MPI_Initialized.html">MPI_Initialized</A>
+-</TR>
+-<TR>	<TD><LI><A HREF="MPIO_Test.html">MPIO_Test</A>
+-	<TD><LI><A HREF="MPI_File_read.html">MPI_File_read</A>
+-	<TD><LI><A HREF="MPI_Int2handle.html">MPI_Int2handle</A>
+-</TR>
+-<TR>	<TD><LI><A HREF="MPIO_Wait.html">MPIO_Wait</A>
+-	<TD><LI><A HREF="MPI_File_read_all.html">MPI_File_read_all</A>
++	<TD><LI><A HREF="MPI_File_read_all_end.html">MPI_File_read_all_end</A>
+ 	<TD><LI><A HREF="MPI_Intercomm_create.html">MPI_Intercomm_create</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Abort.html">MPI_Abort</A>
+-	<TD><LI><A HREF="MPI_File_read_all_begin.html">MPI_File_read_all_begin</A>
++	<TD><LI><A HREF="MPI_File_read_all.html">MPI_File_read_all</A>
+ 	<TD><LI><A HREF="MPI_Intercomm_merge.html">MPI_Intercomm_merge</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Address.html">MPI_Address</A>
+-	<TD><LI><A HREF="MPI_File_read_all_end.html">MPI_File_read_all_end</A>
++	<TD><LI><A HREF="MPI_File_read_at_all_begin.html">MPI_File_read_at_all_begin</A>
+ 	<TD><LI><A HREF="MPI_Iprobe.html">MPI_Iprobe</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Allgather.html">MPI_Allgather</A>
+-	<TD><LI><A HREF="MPI_File_read_at.html">MPI_File_read_at</A>
++	<TD><LI><A HREF="MPI_File_read_at_all_end.html">MPI_File_read_at_all_end</A>
+ 	<TD><LI><A HREF="MPI_Irecv.html">MPI_Irecv</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Allgatherv.html">MPI_Allgatherv</A>
+@@ -40,23 +24,23 @@
+ 	<TD><LI><A HREF="MPI_Irsend.html">MPI_Irsend</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Allreduce.html">MPI_Allreduce</A>
+-	<TD><LI><A HREF="MPI_File_read_at_all_begin.html">MPI_File_read_at_all_begin</A>
++	<TD><LI><A HREF="MPI_File_read_at.html">MPI_File_read_at</A>
+ 	<TD><LI><A HREF="MPI_Isend.html">MPI_Isend</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Alltoall.html">MPI_Alltoall</A>
+-	<TD><LI><A HREF="MPI_File_read_at_all_end.html">MPI_File_read_at_all_end</A>
++	<TD><LI><A HREF="MPI_File_read.html">MPI_File_read</A>
+ 	<TD><LI><A HREF="MPI_Issend.html">MPI_Issend</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Alltoallv.html">MPI_Alltoallv</A>
+-	<TD><LI><A HREF="MPI_File_read_ordered.html">MPI_File_read_ordered</A>
++	<TD><LI><A HREF="MPI_File_read_ordered_begin.html">MPI_File_read_ordered_begin</A>
+ 	<TD><LI><A HREF="MPI_Keyval_create.html">MPI_Keyval_create</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Attr_delete.html">MPI_Attr_delete</A>
+-	<TD><LI><A HREF="MPI_File_read_ordered_begin.html">MPI_File_read_ordered_begin</A>
++	<TD><LI><A HREF="MPI_File_read_ordered_end.html">MPI_File_read_ordered_end</A>
+ 	<TD><LI><A HREF="MPI_Keyval_free.html">MPI_Keyval_free</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Attr_get.html">MPI_Attr_get</A>
+-	<TD><LI><A HREF="MPI_File_read_ordered_end.html">MPI_File_read_ordered_end</A>
++	<TD><LI><A HREF="MPI_File_read_ordered.html">MPI_File_read_ordered</A>
+ 	<TD><LI><A HREF="MPI_NULL_COPY_FN.html">MPI_NULL_COPY_FN</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Attr_put.html">MPI_Attr_put</A>
+@@ -73,225 +57,241 @@
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Bsend.html">MPI_Bsend</A>
+ 	<TD><LI><A HREF="MPI_File_set_atomicity.html">MPI_File_set_atomicity</A>
+-	<TD><LI><A HREF="MPI_Pack.html">MPI_Pack</A>
++	<TD><LI><A HREF="MPIO_Request_c2f.html">MPIO_Request_c2f</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Bsend_init.html">MPI_Bsend_init</A>
+ 	<TD><LI><A HREF="MPI_File_set_errhandler.html">MPI_File_set_errhandler</A>
+-	<TD><LI><A HREF="MPI_Pack_size.html">MPI_Pack_size</A>
++	<TD><LI><A HREF="MPIO_Request_f2c.html">MPIO_Request_f2c</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Buffer_attach.html">MPI_Buffer_attach</A>
+ 	<TD><LI><A HREF="MPI_File_set_info.html">MPI_File_set_info</A>
+-	<TD><LI><A HREF="MPI_Pcontrol.html">MPI_Pcontrol</A>
++	<TD><LI><A HREF="MPIO_Test.html">MPIO_Test</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Buffer_detach.html">MPI_Buffer_detach</A>
+ 	<TD><LI><A HREF="MPI_File_set_size.html">MPI_File_set_size</A>
+-	<TD><LI><A HREF="MPI_Probe.html">MPI_Probe</A>
+-</TR>
+-<TR>	<TD><LI><A HREF="MPI_CHAR.html">MPI_CHAR</A>
+-	<TD><LI><A HREF="MPI_File_set_view.html">MPI_File_set_view</A>
+-	<TD><LI><A HREF="MPI_Recv.html">MPI_Recv</A>
++	<TD><LI><A HREF="MPIO_Wait.html">MPIO_Wait</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Cancel.html">MPI_Cancel</A>
+-	<TD><LI><A HREF="MPI_File_sync.html">MPI_File_sync</A>
+-	<TD><LI><A HREF="MPI_Recv_init.html">MPI_Recv_init</A>
++	<TD><LI><A HREF="MPI_File_set_view.html">MPI_File_set_view</A>
++	<TD><LI><A HREF="MPI_Pack.html">MPI_Pack</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Cart_coords.html">MPI_Cart_coords</A>
+-	<TD><LI><A HREF="MPI_File_write.html">MPI_File_write</A>
+-	<TD><LI><A HREF="MPI_Reduce.html">MPI_Reduce</A>
++	<TD><LI><A HREF="MPI_File_sync.html">MPI_File_sync</A>
++	<TD><LI><A HREF="MPI_Pack_size.html">MPI_Pack_size</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Cart_create.html">MPI_Cart_create</A>
+-	<TD><LI><A HREF="MPI_File_write_all.html">MPI_File_write_all</A>
+-	<TD><LI><A HREF="MPI_Reduce_scatter.html">MPI_Reduce_scatter</A>
++	<TD><LI><A HREF="MPI_File_write_all_begin.html">MPI_File_write_all_begin</A>
++	<TD><LI><A HREF="MPI_Pcontrol.html">MPI_Pcontrol</A>
++</TR>
++<TR>	<TD><LI><A HREF="MPI_Cartdim_get.html">MPI_Cartdim_get</A>
++	<TD><LI><A HREF="MPI_File_write_all_end.html">MPI_File_write_all_end</A>
++	<TD><LI><A HREF="MPI_Probe.html">MPI_Probe</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Cart_get.html">MPI_Cart_get</A>
+-	<TD><LI><A HREF="MPI_File_write_all_begin.html">MPI_File_write_all_begin</A>
+-	<TD><LI><A HREF="MPI_Register_datarep.html">MPI_Register_datarep</A>
++	<TD><LI><A HREF="MPI_File_write_all.html">MPI_File_write_all</A>
++	<TD><LI><A HREF="MPI_Recv.html">MPI_Recv</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Cart_map.html">MPI_Cart_map</A>
+-	<TD><LI><A HREF="MPI_File_write_all_end.html">MPI_File_write_all_end</A>
+-	<TD><LI><A HREF="MPI_Request_c2f.html">MPI_Request_c2f</A>
++	<TD><LI><A HREF="MPI_File_write_at_all_begin.html">MPI_File_write_at_all_begin</A>
++	<TD><LI><A HREF="MPI_Recv_init.html">MPI_Recv_init</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Cart_rank.html">MPI_Cart_rank</A>
+-	<TD><LI><A HREF="MPI_File_write_at.html">MPI_File_write_at</A>
+-	<TD><LI><A HREF="MPI_Request_free.html">MPI_Request_free</A>
++	<TD><LI><A HREF="MPI_File_write_at_all_end.html">MPI_File_write_at_all_end</A>
++	<TD><LI><A HREF="MPI_Reduce.html">MPI_Reduce</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Cart_shift.html">MPI_Cart_shift</A>
+ 	<TD><LI><A HREF="MPI_File_write_at_all.html">MPI_File_write_at_all</A>
+-	<TD><LI><A HREF="MPI_Rsend.html">MPI_Rsend</A>
++	<TD><LI><A HREF="MPI_Reduce_scatter.html">MPI_Reduce_scatter</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Cart_sub.html">MPI_Cart_sub</A>
+-	<TD><LI><A HREF="MPI_File_write_at_all_begin.html">MPI_File_write_at_all_begin</A>
+-	<TD><LI><A HREF="MPI_Rsend_init.html">MPI_Rsend_init</A>
++	<TD><LI><A HREF="MPI_File_write_at.html">MPI_File_write_at</A>
++	<TD><LI><A HREF="MPI_Register_datarep.html">MPI_Register_datarep</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="MPI_Cartdim_get.html">MPI_Cartdim_get</A>
+-	<TD><LI><A HREF="MPI_File_write_at_all_end.html">MPI_File_write_at_all_end</A>
+-	<TD><LI><A HREF="MPI_Scan.html">MPI_Scan</A>
++<TR>	<TD><LI><A HREF="MPI_CHAR.html">MPI_CHAR</A>
++	<TD><LI><A HREF="MPI_File_write.html">MPI_File_write</A>
++	<TD><LI><A HREF="MPI_Request_c2f.html">MPI_Request_c2f</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Comm_compare.html">MPI_Comm_compare</A>
+-	<TD><LI><A HREF="MPI_File_write_ordered.html">MPI_File_write_ordered</A>
+-	<TD><LI><A HREF="MPI_Scatter.html">MPI_Scatter</A>
++	<TD><LI><A HREF="MPI_File_write_ordered_begin.html">MPI_File_write_ordered_begin</A>
++	<TD><LI><A HREF="MPI_Request_free.html">MPI_Request_free</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Comm_create.html">MPI_Comm_create</A>
+-	<TD><LI><A HREF="MPI_File_write_ordered_begin.html">MPI_File_write_ordered_begin</A>
+-	<TD><LI><A HREF="MPI_Scatterv.html">MPI_Scatterv</A>
++	<TD><LI><A HREF="MPI_File_write_ordered_end.html">MPI_File_write_ordered_end</A>
++	<TD><LI><A HREF="MPI_Rsend.html">MPI_Rsend</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Comm_dup.html">MPI_Comm_dup</A>
+-	<TD><LI><A HREF="MPI_File_write_ordered_end.html">MPI_File_write_ordered_end</A>
+-	<TD><LI><A HREF="MPI_Send.html">MPI_Send</A>
++	<TD><LI><A HREF="MPI_File_write_ordered.html">MPI_File_write_ordered</A>
++	<TD><LI><A HREF="MPI_Rsend_init.html">MPI_Rsend_init</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Comm_free.html">MPI_Comm_free</A>
+ 	<TD><LI><A HREF="MPI_File_write_shared.html">MPI_File_write_shared</A>
+-	<TD><LI><A HREF="MPI_Send_init.html">MPI_Send_init</A>
++	<TD><LI><A HREF="MPI_Scan.html">MPI_Scan</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Comm_get_name.html">MPI_Comm_get_name</A>
+-	<TD><LI><A HREF="MPI_Finalize.html">MPI_Finalize</A>
+-	<TD><LI><A HREF="MPI_Sendrecv.html">MPI_Sendrecv</A>
++	<TD><LI><A HREF="MPI_Finalized.html">MPI_Finalized</A>
++	<TD><LI><A HREF="MPI_Scatter.html">MPI_Scatter</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Comm_group.html">MPI_Comm_group</A>
+-	<TD><LI><A HREF="MPI_Finalized.html">MPI_Finalized</A>
+-	<TD><LI><A HREF="MPI_Sendrecv_replace.html">MPI_Sendrecv_replace</A>
++	<TD><LI><A HREF="MPI_Finalize.html">MPI_Finalize</A>
++	<TD><LI><A HREF="MPI_Scatterv.html">MPI_Scatterv</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Comm_rank.html">MPI_Comm_rank</A>
+ 	<TD><LI><A HREF="MPI_Gather.html">MPI_Gather</A>
+-	<TD><LI><A HREF="MPI_Ssend.html">MPI_Ssend</A>
++	<TD><LI><A HREF="MPI_Send.html">MPI_Send</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Comm_remote_group.html">MPI_Comm_remote_group</A>
+ 	<TD><LI><A HREF="MPI_Gatherv.html">MPI_Gatherv</A>
+-	<TD><LI><A HREF="MPI_Ssend_init.html">MPI_Ssend_init</A>
++	<TD><LI><A HREF="MPI_Send_init.html">MPI_Send_init</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Comm_remote_size.html">MPI_Comm_remote_size</A>
+ 	<TD><LI><A HREF="MPI_Get_count.html">MPI_Get_count</A>
+-	<TD><LI><A HREF="MPI_Start.html">MPI_Start</A>
++	<TD><LI><A HREF="MPI_Sendrecv.html">MPI_Sendrecv</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Comm_set_name.html">MPI_Comm_set_name</A>
+ 	<TD><LI><A HREF="MPI_Get_elements.html">MPI_Get_elements</A>
+-	<TD><LI><A HREF="MPI_Startall.html">MPI_Startall</A>
++	<TD><LI><A HREF="MPI_Sendrecv_replace.html">MPI_Sendrecv_replace</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Comm_size.html">MPI_Comm_size</A>
+ 	<TD><LI><A HREF="MPI_Get_processor_name.html">MPI_Get_processor_name</A>
+-	<TD><LI><A HREF="MPI_Status_c2f.html">MPI_Status_c2f</A>
++	<TD><LI><A HREF="MPI_Ssend.html">MPI_Ssend</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Comm_split.html">MPI_Comm_split</A>
+ 	<TD><LI><A HREF="MPI_Get_version.html">MPI_Get_version</A>
+-	<TD><LI><A HREF="MPI_Status_set_cancelled.html">MPI_Status_set_cancelled</A>
++	<TD><LI><A HREF="MPI_Ssend_init.html">MPI_Ssend_init</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Comm_test_inter.html">MPI_Comm_test_inter</A>
+ 	<TD><LI><A HREF="MPI_Graph_create.html">MPI_Graph_create</A>
+-	<TD><LI><A HREF="MPI_Status_set_elements.html">MPI_Status_set_elements</A>
++	<TD><LI><A HREF="MPI_Startall.html">MPI_Startall</A>
++</TR>
++<TR>	<TD><LI><A HREF="MPI_Dims_create.html">MPI_Dims_create</A>
++	<TD><LI><A HREF="MPI_Graphdims_get.html">MPI_Graphdims_get</A>
++	<TD><LI><A HREF="MPI_Start.html">MPI_Start</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_DUP_FN.html">MPI_DUP_FN</A>
+ 	<TD><LI><A HREF="MPI_Graph_get.html">MPI_Graph_get</A>
+-	<TD><LI><A HREF="MPI_Test.html">MPI_Test</A>
+-</TR>
+-<TR>	<TD><LI><A HREF="MPI_Dims_create.html">MPI_Dims_create</A>
+-	<TD><LI><A HREF="MPI_Graph_map.html">MPI_Graph_map</A>
+-	<TD><LI><A HREF="MPI_Test_cancelled.html">MPI_Test_cancelled</A>
++	<TD><LI><A HREF="MPI_Status_c2f.html">MPI_Status_c2f</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Errhandler_create.html">MPI_Errhandler_create</A>
+-	<TD><LI><A HREF="MPI_Graph_neighbors.html">MPI_Graph_neighbors</A>
+-	<TD><LI><A HREF="MPI_Testall.html">MPI_Testall</A>
++	<TD><LI><A HREF="MPI_Graph_map.html">MPI_Graph_map</A>
++	<TD><LI><A HREF="MPI_Status_set_cancelled.html">MPI_Status_set_cancelled</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Errhandler_free.html">MPI_Errhandler_free</A>
+ 	<TD><LI><A HREF="MPI_Graph_neighbors_count.html">MPI_Graph_neighbors_count</A>
+-	<TD><LI><A HREF="MPI_Testany.html">MPI_Testany</A>
++	<TD><LI><A HREF="MPI_Status_set_elements.html">MPI_Status_set_elements</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Errhandler_get.html">MPI_Errhandler_get</A>
+-	<TD><LI><A HREF="MPI_Graphdims_get.html">MPI_Graphdims_get</A>
+-	<TD><LI><A HREF="MPI_Testsome.html">MPI_Testsome</A>
++	<TD><LI><A HREF="MPI_Graph_neighbors.html">MPI_Graph_neighbors</A>
++	<TD><LI><A HREF="MPI_Testall.html">MPI_Testall</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Errhandler_set.html">MPI_Errhandler_set</A>
+ 	<TD><LI><A HREF="MPI_Group_compare.html">MPI_Group_compare</A>
+-	<TD><LI><A HREF="MPI_Topo_test.html">MPI_Topo_test</A>
++	<TD><LI><A HREF="MPI_Testany.html">MPI_Testany</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Error_class.html">MPI_Error_class</A>
+ 	<TD><LI><A HREF="MPI_Group_difference.html">MPI_Group_difference</A>
+-	<TD><LI><A HREF="MPI_Type_commit.html">MPI_Type_commit</A>
++	<TD><LI><A HREF="MPI_Test_cancelled.html">MPI_Test_cancelled</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_Error_string.html">MPI_Error_string</A>
+ 	<TD><LI><A HREF="MPI_Group_excl.html">MPI_Group_excl</A>
+-	<TD><LI><A HREF="MPI_Type_contiguous.html">MPI_Type_contiguous</A>
++	<TD><LI><A HREF="MPI_Test.html">MPI_Test</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_File_c2f.html">MPI_File_c2f</A>
+ 	<TD><LI><A HREF="MPI_Group_free.html">MPI_Group_free</A>
+-	<TD><LI><A HREF="MPI_Type_create_darray.html">MPI_Type_create_darray</A>
++	<TD><LI><A HREF="MPI_Testsome.html">MPI_Testsome</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_File_close.html">MPI_File_close</A>
+ 	<TD><LI><A HREF="MPI_Group_incl.html">MPI_Group_incl</A>
+-	<TD><LI><A HREF="MPI_Type_create_subarray.html">MPI_Type_create_subarray</A>
++	<TD><LI><A HREF="MPI_Topo_test.html">MPI_Topo_test</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_File_delete.html">MPI_File_delete</A>
+ 	<TD><LI><A HREF="MPI_Group_intersection.html">MPI_Group_intersection</A>
+-	<TD><LI><A HREF="MPI_Type_extent.html">MPI_Type_extent</A>
++	<TD><LI><A HREF="MPI_Type_commit.html">MPI_Type_commit</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_File_f2c.html">MPI_File_f2c</A>
+ 	<TD><LI><A HREF="MPI_Group_range_excl.html">MPI_Group_range_excl</A>
+-	<TD><LI><A HREF="MPI_Type_free.html">MPI_Type_free</A>
++	<TD><LI><A HREF="MPI_Type_contiguous.html">MPI_Type_contiguous</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_File_get_amode.html">MPI_File_get_amode</A>
+ 	<TD><LI><A HREF="MPI_Group_range_incl.html">MPI_Group_range_incl</A>
+-	<TD><LI><A HREF="MPI_Type_get_contents.html">MPI_Type_get_contents</A>
++	<TD><LI><A HREF="MPI_Type_create_darray.html">MPI_Type_create_darray</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_File_get_atomicity.html">MPI_File_get_atomicity</A>
+ 	<TD><LI><A HREF="MPI_Group_rank.html">MPI_Group_rank</A>
+-	<TD><LI><A HREF="MPI_Type_get_envelope.html">MPI_Type_get_envelope</A>
++	<TD><LI><A HREF="MPI_Type_create_subarray.html">MPI_Type_create_subarray</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_File_get_byte_offset.html">MPI_File_get_byte_offset</A>
+ 	<TD><LI><A HREF="MPI_Group_size.html">MPI_Group_size</A>
+-	<TD><LI><A HREF="MPI_Type_hvector.html">MPI_Type_hvector</A>
++	<TD><LI><A HREF="MPI_Type_extent.html">MPI_Type_extent</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_File_get_errhandler.html">MPI_File_get_errhandler</A>
+ 	<TD><LI><A HREF="MPI_Group_translate_ranks.html">MPI_Group_translate_ranks</A>
+-	<TD><LI><A HREF="MPI_Type_lb.html">MPI_Type_lb</A>
++	<TD><LI><A HREF="MPI_Type_free.html">MPI_Type_free</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_File_get_group.html">MPI_File_get_group</A>
+ 	<TD><LI><A HREF="MPI_Group_union.html">MPI_Group_union</A>
+-	<TD><LI><A HREF="MPI_Type_size.html">MPI_Type_size</A>
++	<TD><LI><A HREF="MPI_Type_get_contents.html">MPI_Type_get_contents</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_File_get_info.html">MPI_File_get_info</A>
+ 	<TD><LI><A HREF="MPI_Ibsend.html">MPI_Ibsend</A>
+-	<TD><LI><A HREF="MPI_Type_struct.html">MPI_Type_struct</A>
++	<TD><LI><A HREF="MPI_Type_get_envelope.html">MPI_Type_get_envelope</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_File_get_position.html">MPI_File_get_position</A>
+ 	<TD><LI><A HREF="MPI_Info_c2f.html">MPI_Info_c2f</A>
+-	<TD><LI><A HREF="MPI_Type_ub.html">MPI_Type_ub</A>
++	<TD><LI><A HREF="MPI_Type_hvector.html">MPI_Type_hvector</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_File_get_position_shared.html">MPI_File_get_position_shared</A>
+ 	<TD><LI><A HREF="MPI_Info_create.html">MPI_Info_create</A>
+-	<TD><LI><A HREF="MPI_Type_vector.html">MPI_Type_vector</A>
++	<TD><LI><A HREF="MPI_Type_lb.html">MPI_Type_lb</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_File_get_size.html">MPI_File_get_size</A>
+ 	<TD><LI><A HREF="MPI_Info_delete.html">MPI_Info_delete</A>
+-	<TD><LI><A HREF="MPI_Unpack.html">MPI_Unpack</A>
++	<TD><LI><A HREF="MPI_Type_size.html">MPI_Type_size</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_File_get_type_extent.html">MPI_File_get_type_extent</A>
+ 	<TD><LI><A HREF="MPI_Info_dup.html">MPI_Info_dup</A>
+-	<TD><LI><A HREF="MPI_Wait.html">MPI_Wait</A>
++	<TD><LI><A HREF="MPI_Type_struct.html">MPI_Type_struct</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_File_get_view.html">MPI_File_get_view</A>
+ 	<TD><LI><A HREF="MPI_Info_f2c.html">MPI_Info_f2c</A>
+-	<TD><LI><A HREF="MPI_Waitall.html">MPI_Waitall</A>
++	<TD><LI><A HREF="MPI_Type_ub.html">MPI_Type_ub</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="MPI_File_iread.html">MPI_File_iread</A>
++<TR>	<TD><LI><A HREF="MPI_File_iread_at.html">MPI_File_iread_at</A>
+ 	<TD><LI><A HREF="MPI_Info_free.html">MPI_Info_free</A>
+-	<TD><LI><A HREF="MPI_Waitany.html">MPI_Waitany</A>
++	<TD><LI><A HREF="MPI_Type_vector.html">MPI_Type_vector</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="MPI_File_iread_at.html">MPI_File_iread_at</A>
++<TR>	<TD><LI><A HREF="MPI_File_iread.html">MPI_File_iread</A>
+ 	<TD><LI><A HREF="MPI_Info_get.html">MPI_Info_get</A>
+-	<TD><LI><A HREF="MPI_Waitsome.html">MPI_Waitsome</A>
++	<TD><LI><A HREF="MPI_Unpack.html">MPI_Unpack</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="MPI_File_iread_shared.html">MPI_File_iread_shared</A>
+ 	<TD><LI><A HREF="MPI_Info_get_nkeys.html">MPI_Info_get_nkeys</A>
+-	<TD><LI><A HREF="MPI_Wtick.html">MPI_Wtick</A>
++	<TD><LI><A HREF="MPI_Waitall.html">MPI_Waitall</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="MPI_File_iwrite.html">MPI_File_iwrite</A>
++<TR>	<TD><LI><A HREF="MPI_File_iwrite_at.html">MPI_File_iwrite_at</A>
+ 	<TD><LI><A HREF="MPI_Info_get_nthkey.html">MPI_Info_get_nthkey</A>
+-	<TD><LI><A HREF="MPI_Wtime.html">MPI_Wtime</A>
++	<TD><LI><A HREF="MPI_Waitany.html">MPI_Waitany</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="MPI_File_iwrite_at.html">MPI_File_iwrite_at</A>
++<TR>	<TD><LI><A HREF="MPI_File_iwrite.html">MPI_File_iwrite</A>
+ 	<TD><LI><A HREF="MPI_Info_get_valuelen.html">MPI_Info_get_valuelen</A>
+-	<TD></TR>
++	<TD><LI><A HREF="MPI_Wait.html">MPI_Wait</A>
++</TR>
+ <TR>	<TD><LI><A HREF="MPI_File_iwrite_shared.html">MPI_File_iwrite_shared</A>
+ 	<TD><LI><A HREF="MPI_Info_set.html">MPI_Info_set</A>
++	<TD><LI><A HREF="MPI_Waitsome.html">MPI_Waitsome</A>
++</TR>
++<TR>	<TD><LI><A HREF="MPI_File_open.html">MPI_File_open</A>
++	<TD><LI><A HREF="MPI_Init.html">MPI_Init</A>
++	<TD><LI><A HREF="MPI_Wtick.html">MPI_Wtick</A>
++</TR>
++<TR>	<TD><LI><A HREF="MPI_File_preallocate.html">MPI_File_preallocate</A>
++	<TD><LI><A HREF="MPI_Initialized.html">MPI_Initialized</A>
++	<TD><LI><A HREF="MPI_Wtime.html">MPI_Wtime</A>
++</TR>
++<TR>	<TD><LI><A HREF="MPI_File_read_all_begin.html">MPI_File_read_all_begin</A>
++	<TD><LI><A HREF="MPI_Init_thread.html">MPI_Init_thread</A>
++	<TD></TR>
++<TR>	<TD><LI><A HREF="MPI_File_read_all_end.html">MPI_File_read_all_end</A>
++	<TD><LI><A HREF="MPI_Int2handle.html">MPI_Int2handle</A>
+ 	<TD></TR>
+ </TABLE>
+ </BODY>
+--- mpich-1.2.7.orig/www/www4/index.html
++++ mpich-1.2.7/www/www4/index.html
+@@ -4,92 +4,92 @@
+ <H1>MPE Routines</H1>
+ <MENU>
+ <TABLE>
+-<TR>	<TD><LI><A HREF="CLOG_Finalize.html">CLOG_Finalize</A>
+-	<TD><LI><A HREF="MPE_CaptureFile.html">MPE_CaptureFile</A>
+-	<TD><LI><A HREF="MPE_Iget_mouse_press.html">MPE_Iget_mouse_press</A>
+-</TR>
+-<TR>	<TD><LI><A HREF="CLOG_Init.html">CLOG_Init</A>
++<TR>	<TD><LI><A HREF="CLOG_commtype.html">CLOG_commtype</A>
+ 	<TD><LI><A HREF="MPE_Close_graphics.html">MPE_Close_graphics</A>
+-	<TD><LI><A HREF="MPE_Init_log.html">MPE_Init_log</A>
++	<TD><LI><A HREF="MPE_Initialized_logging.html">MPE_Initialized_logging</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="CLOG_Output.html">CLOG_Output</A>
++<TR>	<TD><LI><A HREF="CLOG_cput.html">CLOG_cput</A>
+ 	<TD><LI><A HREF="MPE_Comm_global_rank.html">MPE_Comm_global_rank</A>
+-	<TD><LI><A HREF="MPE_Initialized_logging.html">MPE_Initialized_logging</A>
++	<TD><LI><A HREF="MPE_Init_log.html">MPE_Init_log</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="CLOG_commtype.html">CLOG_commtype</A>
++<TR>	<TD><LI><A HREF="CLOG_csync.html">CLOG_csync</A>
+ 	<TD><LI><A HREF="MPE_Counter_create.html">MPE_Counter_create</A>
+-	<TD><LI><A HREF="MPE_Line_thickness.html">MPE_Line_thickness</A>
++	<TD><LI><A HREF="MPE_IO_Stdout_to_file.html">MPE_IO_Stdout_to_file</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="CLOG_cput.html">CLOG_cput</A>
++<TR>	<TD><LI><A HREF="CLOG_Finalize.html">CLOG_Finalize</A>
+ 	<TD><LI><A HREF="MPE_Counter_free.html">MPE_Counter_free</A>
+-	<TD><LI><A HREF="MPE_Log_event.html">MPE_Log_event</A>
++	<TD><LI><A HREF="MPE_Line_thickness.html">MPE_Line_thickness</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="CLOG_csync.html">CLOG_csync</A>
++<TR>	<TD><LI><A HREF="CLOG_get_new_event.html">CLOG_get_new_event</A>
+ 	<TD><LI><A HREF="MPE_Counter_nxtval.html">MPE_Counter_nxtval</A>
+-	<TD><LI><A HREF="MPE_Log_get_event_number.html">MPE_Log_get_event_number</A>
++	<TD><LI><A HREF="MPE_Log_event.html">MPE_Log_event</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="CLOG_get_new_event.html">CLOG_get_new_event</A>
++<TR>	<TD><LI><A HREF="CLOG_get_new_state.html">CLOG_get_new_state</A>
+ 	<TD><LI><A HREF="MPE_Decomp1d.html">MPE_Decomp1d</A>
+-	<TD><LI><A HREF="MPE_Log_receive.html">MPE_Log_receive</A>
++	<TD><LI><A HREF="MPE_Log_get_event_number.html">MPE_Log_get_event_number</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="CLOG_get_new_state.html">CLOG_get_new_state</A>
++<TR>	<TD><LI><A HREF="CLOG_init_buffers.html">CLOG_init_buffers</A>
+ 	<TD><LI><A HREF="MPE_Describe_event.html">MPE_Describe_event</A>
+-	<TD><LI><A HREF="MPE_Log_send.html">MPE_Log_send</A>
++	<TD><LI><A HREF="MPE_Log_receive.html">MPE_Log_receive</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="CLOG_init_buffers.html">CLOG_init_buffers</A>
++<TR>	<TD><LI><A HREF="CLOG_Init.html">CLOG_Init</A>
+ 	<TD><LI><A HREF="MPE_Describe_state.html">MPE_Describe_state</A>
+-	<TD><LI><A HREF="MPE_Make_color_array.html">MPE_Make_color_array</A>
++	<TD><LI><A HREF="MPE_Log_send.html">MPE_Log_send</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="CLOG_mergelogs.html">CLOG_mergelogs</A>
+ 	<TD><LI><A HREF="MPE_Draw_circle.html">MPE_Draw_circle</A>
+-	<TD><LI><A HREF="MPE_Num_colors.html">MPE_Num_colors</A>
++	<TD><LI><A HREF="MPE_Make_color_array.html">MPE_Make_color_array</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="CLOG_mergend.html">CLOG_mergend</A>
+ 	<TD><LI><A HREF="MPE_Draw_line.html">MPE_Draw_line</A>
+-	<TD><LI><A HREF="MPE_Open_graphics.html">MPE_Open_graphics</A>
++	<TD><LI><A HREF="MPE_Num_colors.html">MPE_Num_colors</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="CLOG_msgtype.html">CLOG_msgtype</A>
+ 	<TD><LI><A HREF="MPE_Draw_logic.html">MPE_Draw_logic</A>
+-	<TD><LI><A HREF="MPE_Print_datatype_pack_action.html">MPE_Print_datatype_pack_action</A>
++	<TD><LI><A HREF="MPE_Open_graphics.html">MPE_Open_graphics</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="CLOG_newbuff.html">CLOG_newbuff</A>
+ 	<TD><LI><A HREF="MPE_Draw_point.html">MPE_Draw_point</A>
+-	<TD><LI><A HREF="MPE_Print_datatype_unpack_action.html">MPE_Print_datatype_unpack_action</A>
++	<TD><LI><A HREF="MPE_Print_datatype_pack_action.html">MPE_Print_datatype_pack_action</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="CLOG_nodebuffer2disk.html">CLOG_nodebuffer2disk</A>
+ 	<TD><LI><A HREF="MPE_Draw_points.html">MPE_Draw_points</A>
++	<TD><LI><A HREF="MPE_Print_datatype_unpack_action.html">MPE_Print_datatype_unpack_action</A>
++</TR>
++<TR>	<TD><LI><A HREF="CLOG_Output.html">CLOG_Output</A>
++	<TD><LI><A HREF="MPE_Draw_string.html">MPE_Draw_string</A>
+ 	<TD><LI><A HREF="MPE_ReturnTags.html">MPE_ReturnTags</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="CLOG_procbuf.html">CLOG_procbuf</A>
+-	<TD><LI><A HREF="MPE_Draw_string.html">MPE_Draw_string</A>
++	<TD><LI><A HREF="MPE_Fill_circle.html">MPE_Fill_circle</A>
+ 	<TD><LI><A HREF="MPE_Seq_begin.html">MPE_Seq_begin</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="CLOG_reclen.html">CLOG_reclen</A>
+-	<TD><LI><A HREF="MPE_Fill_circle.html">MPE_Fill_circle</A>
++	<TD><LI><A HREF="MPE_Fill_rectangle.html">MPE_Fill_rectangle</A>
+ 	<TD><LI><A HREF="MPE_Seq_end.html">MPE_Seq_end</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="CLOG_rectype.html">CLOG_rectype</A>
+-	<TD><LI><A HREF="MPE_Fill_rectangle.html">MPE_Fill_rectangle</A>
++	<TD><LI><A HREF="MPE_Finish_log.html">MPE_Finish_log</A>
+ 	<TD><LI><A HREF="MPE_Start_log.html">MPE_Start_log</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="CLOG_reinit_buff.html">CLOG_reinit_buff</A>
+-	<TD><LI><A HREF="MPE_Finish_log.html">MPE_Finish_log</A>
++	<TD><LI><A HREF="MPE_Get_mouse_press.html">MPE_Get_mouse_press</A>
+ 	<TD><LI><A HREF="MPE_Stop_log.html">MPE_Stop_log</A>
+ </TR>
+ <TR>	<TD><LI><A HREF="CLOG_treesetup.html">CLOG_treesetup</A>
+ 	<TD><LI><A HREF="MPE_GetTags.html">MPE_GetTags</A>
+ 	<TD><LI><A HREF="MPE_TagsEnd.html">MPE_TagsEnd</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="MPE.html">MPE</A>
+-	<TD><LI><A HREF="MPE_Get_mouse_press.html">MPE_Get_mouse_press</A>
++<TR>	<TD><LI><A HREF="MPE_Add_RGB_color.html">MPE_Add_RGB_color</A>
++	<TD><LI><A HREF="MPE.html">MPE</A>
+ 	<TD><LI><A HREF="MPE_Update.html">MPE_Update</A>
+ </TR>
+-<TR>	<TD><LI><A HREF="MPE_Add_RGB_color.html">MPE_Add_RGB_color</A>
+-	<TD><LI><A HREF="MPE_IO_Stdout_to_file.html">MPE_IO_Stdout_to_file</A>
+-	<TD></TR>
+ <TR>	<TD><LI><A HREF="MPE_CaptureFile.html">MPE_CaptureFile</A>
+ 	<TD><LI><A HREF="MPE_Iget_mouse_press.html">MPE_Iget_mouse_press</A>
+ 	<TD></TR>
++<TR>	<TD><LI><A HREF="MPE_Close_graphics.html">MPE_Close_graphics</A>
++	<TD><LI><A HREF="MPE_Initialized_logging.html">MPE_Initialized_logging</A>
++	<TD></TR>
+ </TABLE>
+ </MENU>
+ </BODY>
+--- mpich-1.2.7.orig/examples/perftest/aclocal.m4
++++ mpich-1.2.7/examples/perftest/aclocal.m4
+@@ -878,7 +878,34 @@
+ EOF
+     ac_link2='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest1.c conftest2.c $LIBS >conftest.out 2>&1'
+     if eval $ac_link2 ; then
+-        pac_cv_prog_c_weak_symbols="pragma weak"
++        # The gcc 3.4.x compiler accepts the pragma weak, but does not
++        # correctly implement it on systems where the loader doesn't 
++        # support weak symbols (e.g., cygwin).  This is a bug in gcc, but it
++        # it is one that *we* have to detect.
++        rm -f conftest*
++        cat >>conftest1.c <<EOF
++extern int PFoo(int);
++#pragma weak PFoo = Foo
++int Foo(int);
++int Foo(int a) { return a; }
++EOF
++    cat >>conftest2.c <<EOF
++extern int Foo(int);
++int PFoo(int a) { return a+1;}
++int main(int argc, char **argv) {
++return Foo(0);}
++EOF
++        if eval $ac_link2 ; then
++            pac_cv_prog_c_weak_symbols="pragma weak"
++        else 
++            echo "$ac_link2" >> config.log
++	    echo "Failed program was" >> config.log
++            cat conftest1.c >>config.log
++            cat conftest2.c >>config.log
++            if test -s conftest.out ; then cat conftest.out >> config.log ; fi
++            has_pragma_weak=0
++            pragma_extra_message="pragma weak accepted but does not work (probably creates two non-weak entries)"
++        fi
+     else
+       echo "$ac_link2" >>config.log
+       echo "Failed program was" >>config.log
+@@ -1089,6 +1116,8 @@
+ dnl here are some possible choices
+ dnl Solaris cc
+ dnl  -fd -v -Xc
++dnl -Xc is strict ANSI (some version) and does not allow "long long", for 
++dnl example
+ dnl IRIX
+ dnl  -ansi -DEBUG:trap_uninitialized=ON:varargs_interface_check=ON:verbose_runtime=ON
+ dnl
+@@ -1299,6 +1328,7 @@
+ ac_cv_prog_cc_globals_work,[
+ AC_REQUIRE([AC_PROG_RANLIB])
+ ac_cv_prog_cc_globals_work=no
++rm -f libconftest.a
+ echo 'extern int a; int a;' > conftest1.c
+ echo 'extern int a; int main( ){ return a; }' > conftest2.c
+ if ${CC-cc} $CFLAGS -c conftest1.c >conftest.out 2>&1 ; then
+@@ -1308,6 +1338,17 @@
+ 		# Success!  C works
+ 		ac_cv_prog_cc_globals_work=yes
+ 	    else
++		echo "Error linking program with uninitialized global" >&AC_FD_CC
++	        echo "Programs were:" >&AC_FD_CC
++		echo "conftest1.c:" >&AC_FD_CC
++                cat conftest1.c >&AC_FD_CC
++		echo "conftest2.c:" >&AC_FD_CC
++		cat conftest2.c >&AC_FD_CC
++		echo "and link line was:" >&AC_FD_CC
++		echo "${CC-cc} $CFLAGS -o conftest conftest2.c $LDFLAGS libconftest.a" >&AC_FD_CC
++		echo "with output:" >&AC_FD_CC
++		cat conftest.out >&AC_FD_CC
++
+ 	        # Failure!  Do we need -fno-common?
+ 	        ${CC-cc} $CFLAGS -fno-common -c conftest1.c >> conftest.out 2>&1
+ 		rm -f libconftest.a
+@@ -1318,7 +1359,9 @@
+ 		    CFLAGS="$CFLAGS -fno-common"
+                 elif test -n "$RANLIB" ; then 
+ 		    # Try again, with ranlib changed to ranlib -c
+-		    ${RANLIB} -c libconftest.a
++                    # (send output to /dev/null incase this ranlib
++                    # doesn't know -c)
++		    ${RANLIB} -c libconftest.a >/dev/null 2>&1
+ 		    if ${CC-cc} $CFLAGS -o conftest conftest2.c $LDFLAGS libconftest.a >> conftest.out 2>&1 ; then
+ 			RANLIB="$RANLIB -c"
+ 	 	    #else
+@@ -1577,6 +1620,13 @@
+   fprintf(f, "%d\n", sizeof(a) + sizeof(b));
+   exit(0);
+ }],AC_CV_NAME=`cat conftestval`,AC_CV_NAME=0,ifelse([$4],,,AC_CV_NAME=$4))])
++if test "X$AC_CV_NAME" = "X" ; then
++    # We have a problem.  The test returned a zero status, but no output,
++    # or we're cross-compiling (or think we are) and have no value for 
++    # this object
++    :
++fi
++rm -f conftestval
+ AC_MSG_RESULT($AC_CV_NAME)
+ dnl AC_DEFINE_UNQUOTED(AC_TYPE_NAME,$AC_CV_NAME)
+ undefine([AC_TYPE_NAME])undefine([AC_CV_NAME])
+@@ -2301,6 +2351,7 @@
+ dnl+ \-\-with\-mpich[=path] - MPICH.  'path' is the location of MPICH commands
+ dnl. \-\-with\-ibmmpi - IBM MPI
+ dnl. \-\-with\-lammpi[=path] - LAM/MPI
++dnl. \-\-with\-mpichnt - MPICH NT
+ dnl- \-\-with\-sgimpi - SGI MPI
+ dnl If no type is selected, and a default ("mpich", "ibmmpi", or "sgimpi")
+ dnl is given, that type is used as if '--with-<default>' was given.
+@@ -2311,6 +2362,13 @@
+ dnl programs that may need to be run before and after running MPI programs.
+ dnl For example, 'MPIBOOT' may start demons necessary to run MPI programs and
+ dnl 'MPIUNBOOT' will stop those demons.
++dnl 
++dnl The two forms of the compilers are to allow for tests of the compiler
++dnl when the MPI version of the compiler creates executables that cannot
++dnl be run on the local system (for example, the IBM SP, where executables
++dnl created with mpcc will not run locally, but executables created
++dnl with xlc may be used to discover properties of the compiler, such as
++dnl the size of data types).
+ dnl
+ dnl See also:
+ dnl PAC_LANG_PUSH_COMPILERS, PAC_LIB_MPI
+@@ -2347,6 +2405,11 @@
+ if test "$ac_mpi_type" = "unknown" -a "$pac_lib_mpi_is_building" = "yes" ; then
+     ac_mpi_type="mpich"
+ fi
++# Set defaults
++MPIRUN_NP="-np "
++MPIEXEC_N="-n "
++AC_SUBST(MPIRUN_NP)
++AC_SUBST(MPIEXEC_N)
+ case $ac_mpi_type in
+ 	mpich)
+         dnl 
+@@ -2375,6 +2438,7 @@
+             TESTCXX=${CXX-CC}
+             CXX="$MPICXX"
+ 	    # We may want to restrict this to the path containing mpirun
++	    AC_PATH_PROG(MPIEXEC,mpiexec)
+ 	    AC_PATH_PROG(MPIRUN,mpirun)
+ 	    AC_PATH_PROG(MPIBOOT,mpichboot)
+ 	    AC_PATH_PROG(MPIUNBOOT,mpichstop)
+@@ -2438,6 +2502,11 @@
+ 	;;
+ 
+ 	ibmmpi)
++	AC_CHECK_PROGS(MPCC,mpcc)
++	AC_CHECK_PROGS(MPXLF,mpxlf)
++	if test -z "$MPCC" -o -z "$MPXLF" ; then
++	    AC_MSG_ERROR([Could not find IBM MPI compilation scripts.  Either mpcc or mpxlf is missing])
++	fi
+ 	TESTCC=${CC-xlC}; TESTF77=${F77-xlf}; CC=mpcc; F77=mpxlf
+ 	# There is no mpxlf90, but the options langlvl and free can
+ 	# select the F90 version of xlf
+@@ -2534,7 +2603,11 @@
+ ac_ext=$pac_cv_f90_ext
+ ac_compile='${F90-f90} -c $F90FLAGS conftest.$ac_ext 1>&AC_FD_CC'
+ ac_link='${F90-f90} -o conftest${ac_exeext} $F90FLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
+-cross_compiling=$pac_cv_prog_f90_cross
++dnl cross_compiling no longer maintained by autoconf as part of the
++dnl AC_LANG changes.  If we set it here, a later AC_LANG may not 
++dnl restore it (in the case where one compiler claims to be a cross compiler
++dnl and another does not)
++dnl cross_compiling=$pac_cv_prog_f90_cross
+ ])
+ dnl
+ dnl This is an addition for AC_TRY_COMPILE, but for f90.  If the current 
+@@ -2846,7 +2919,7 @@
+ # ifc - An older Intel compiler
+ AC_DEFUN(PAC_PROG_F90,[
+ if test -z "$F90" ; then
+-    AC_CHECK_PROGS(F90,f90 xlf90 pgf90 ifort epcf90 f95 fort xlf95 lf95 pathf90 g95 fc ifc efc)
++    AC_CHECK_PROGS(F90,f90 xlf90 pgf90 ifort epcf90 f95 fort xlf95 lf95 pathf90 g95 gfortran ifc efc)
+     test -z "$F90" && AC_MSG_WARN([no acceptable Fortran 90 compiler found in \$PATH])
+ fi
+ if test -n "$F90" ; then
+@@ -2906,7 +2979,11 @@
+ ac_ext=$pac_cv_f90_ext
+ ac_compile='${F90-f90} -c $F90FLAGS conftest.$ac_ext 1>&AC_FD_CC'
+ ac_link='${F90-f90} -o conftest${ac_exeext} $F90FLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
+-cross_compiling=$pac_cv_prog_f90_cross
++dnl cross_compiling no longer maintained by autoconf as part of the
++dnl AC_LANG changes.  If we set it here, a later AC_LANG may not 
++dnl restore it (in the case where one compiler claims to be a cross compiler
++dnl and another does not)
++dnl cross_compiling=$pac_cv_prog_f90_cross
+ # Include a Fortran 90 construction to distinguish between Fortran 77 
+ # and Fortran 90 compilers.
+ cat >conftest.$ac_ext <<EOF
+@@ -2936,7 +3013,11 @@
+ fi
+ AC_MSG_CHECKING([whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) is a cross-compiler])
+ AC_MSG_RESULT($pac_cv_prog_f90_cross)
+-cross_compiling=$pac_cv_prog_f90_cross
++dnl cross_compiling no longer maintained by autoconf as part of the
++dnl AC_LANG changes.  If we set it here, a later AC_LANG may not 
++dnl restore it (in the case where one compiler claims to be a cross compiler
++dnl and another does not)
++dnl cross_compiling=$pac_cv_prog_f90_cross
+ ])
+ dnl
+ dnl This version uses a Fortran program to link programs.
+@@ -3049,11 +3130,11 @@
+        program main
+        integer a
+        a = 1
+-       call t1(a)
++       call t1_2(a)
+        end
+ EOF
+ cat > conftest2.f <<EOF
+-       subroutine t1(b)
++       subroutine t1_2(b)
+        integer b
+        b = b + 1
+        end
+@@ -3207,11 +3288,15 @@
+     *) AC_MSG_WARN([Unknown Fortran naming scheme]) ;;
+ esac
+ AC_SUBST(F77_NAME_MANGLE)
++# Get the standard call definition
++# FIXME: This should use F77_STDCALL, not STDCALL (non-conforming name)
+ if test "X$pac_cv_test_stdcall" = "X" ; then
+-        AC_DEFINE(STDCALL,,[Define calling convention])
++    F77_STDCALL=""
+ else
+-        AC_DEFINE(STDCALL,__stdcall,[Define calling convention])
++    F77_STDCALL="__stdcall"
+ fi
++# 
++AC_DEFINE_UNQUOTED(STDCALL,$F77_STDCALL,[Define calling convention])
+ ],[$1])
+ ])
+ dnl
+@@ -3418,10 +3503,9 @@
+ pac_cv_prog_f77_exclaim_comments,[
+ AC_LANG_SAVE
+ AC_LANG_FORTRAN77
+-AC_TRY_COMPILE(,[
+-!      This is a comment
+-],pac_cv_prog_f77_exclaim_comments="yes",
+-pac_cv_prog_f77_exclaim_comments="no")
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[!        This is a comment])],
++     pac_cv_prog_f77_exclaim_comments="yes",
++     pac_cv_prog_f77_exclaim_comments="no")
+ AC_LANG_RESTORE
+ ])
+ if test "$pac_cv_prog_f77_exclaim_comments" = "yes" ; then
+@@ -3806,6 +3890,13 @@
+ 		continue
+ 	   fi
+ 	   ;;
++	7) # gfortran won't find getarg if it is marked as external 
++	   FXX_MODULE=""
++	   F77_GETARGDECL="intrinsic GETARG"
++	   F77_GETARG="call GETARG(i,s)"
++	   F77_IARGC="IARGC()"
++	   MSG="intrinsic GETARG and IARGC"
++	   ;;
+         *) # exit from while loop
+ 	   FXX_MODULE=""
+ 	   F77_GETARGDECL=""
+@@ -3937,8 +4028,11 @@
+     ac_fcompileforlib='${F77-f77} -c $FFLAGS conftest1.f 1>&AC_FD_CC'
+     if AC_TRY_EVAL(ac_fcompileforlib) && test -s conftest1.o ; then
+         if test ! -d conftest ; then mkdir conftest2 ; fi
+-	dnl Use arcmd incase AR is defined as "ar cr"
+-        AC_TRY_COMMAND(${ARCMD-"ar"} cr conftest2/libconftest.a conftest1.o)
++	# We have had some problems with "AR" set to "ar cr"; this is
++	# a user-error; AR should be set to just the program (plus
++	# any flags that affect the object file format, such as -X64 
++	# required for 64-bit objects in some versions of AIX).
++        AC_TRY_COMMAND(${AR-"ar"} cr conftest2/libconftest.a conftest1.o)
+         AC_TRY_COMMAND(${RANLIB-ranlib} conftest2/libconftest.a)
+         ac_fcompileldtest='${F77-f77} -o conftest $FFLAGS ${ldir}conftest2 conftest.f -lconftest $LDFLAGS 1>&AC_FD_CC'
+         for ldir in "-L" "-Wl,-L," ; do
+@@ -4060,11 +4154,13 @@
+ pac_cv_prog_f77_has_pointer,[
+ AC_LANG_SAVE
+ AC_LANG_FORTRAN77
+-AC_TRY_COMPILE(,[
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
+         integer M
+         pointer (MPTR,M)
+         data MPTR/0/
+-],pac_cv_prog_f77_has_pointer="yes",pac_cv_prog_f77_has_pointer="no")
++])],
++    pac_cv_prog_f77_has_pointer="yes",
++    pac_cv_prog_f77_has_pointer="no")
+ AC_LANG_RESTORE
+ ])
+ if test "$pac_cv_prog_f77_has_pointer" = "yes" ; then
+@@ -4244,9 +4340,14 @@
+         end
+ EOF
+ if AC_TRY_EVAL(ac_compile); then
+-    if ${F77} -o conftest conftest.o conftest1.o $LDFLAGS 2>&AC_FD_CC ; then
++    # We include $FFLAGS on the link line because this is 
++    # the way in which most of the configure tests run.  In particular,
++    # many users are used to using FFLAGS (and CFLAGS) to select
++    # different instruction sets, such as 64-bit with -xarch=v9 for 
++    # Solaris.
++    if ${F77} ${FFLAGS} -o conftest conftest.o conftest1.o $LDFLAGS 2>&AC_FD_CC ; then
+ 	AC_MSG_RESULT([Use Fortran to link programs])
+-    elif ${CC} -o conftest conftest.o conftest1.o $LDFLAGS $FLIBS 2>&AC_FD_CC ; then
++    elif ${CC} ${CFLAGS} -o conftest conftest.o conftest1.o $LDFLAGS $FLIBS 2>&AC_FD_CC ; then
+ 	AC_MSG_RESULT([Use C with FLIBS to link programs])
+ 	F77LINKER="$CC"
+         F77_LDFLAGS="$F77_LDFLAGS $FLIBS"
+@@ -4298,10 +4399,9 @@
+ pac_cv_prog_f77_new_char_decl,[
+ AC_LANG_SAVE
+ AC_LANG_FORTRAN77
+-AC_TRY_COMPILE(,[
+-        character (len=10) s
+-],pac_cv_prog_f77_new_char_decl="yes",
+-pac_cv_prog_f77_new_char_decl="no")
++AC_COMPILE_IFLESE([AC_LANG_PROGRAM(,[        character (len=10) s])],
++    pac_cv_prog_f77_new_char_decl="yes",
++    pac_cv_prog_f77_new_char_decl="no")
+ AC_LANG_RESTORE
+ ])
+ if test "$pac_cv_prog_f77_new_char_decl" = "yes" ; then
+--- mpich-1.2.7.orig/examples/perftest/Makefile.in
++++ mpich-1.2.7/examples/perftest/Makefile.in
+@@ -83,13 +83,18 @@
+ HAVE_ROMIO = @HAVE_ROMIO@
+ MAKE = @MAKE@
+ MAKEINFO = @MAKEINFO@
++MPCC = @MPCC@
+ MPIBOOT = @MPIBOOT@
+ MPICC = @MPICC@
+ MPICXX = @MPICXX@
++MPIEXEC = @MPIEXEC@
++MPIEXEC_N = @MPIEXEC_N@
+ MPIF77 = @MPIF77@
+ MPIF90 = @MPIF90@
+ MPIRUN = @MPIRUN@
++MPIRUN_NP = @MPIRUN_NP@
+ MPIUNBOOT = @MPIUNBOOT@
++MPXLF = @MPXLF@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+ RANLIB_AFTER_INSTALL = @RANLIB_AFTER_INSTALL@
+--- mpich-1.2.7.orig/examples/perftest/configure
++++ mpich-1.2.7/examples/perftest/configure
+@@ -1125,6 +1125,11 @@
+ if test "$ac_mpi_type" = "unknown" -a "$pac_lib_mpi_is_building" = "yes" ; then
+     ac_mpi_type="mpich"
+ fi
++# Set defaults
++MPIRUN_NP="-np "
++MPIEXEC_N="-n "
++
++
+ case $ac_mpi_type in
+ 	mpich)
+                                 if test "X$pac_lib_mpi_is_building" != "Xyes" ; then
+@@ -1140,7 +1145,7 @@
+             # Extract the first word of "mpicc", so it can be a program name with args.
+ set dummy mpicc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1144: checking for $ac_word" >&5
++echo "configure:1149: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MPICC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1177,7 +1182,7 @@
+             # Extract the first word of "mpif77", so it can be a program name with args.
+ set dummy mpif77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1181: checking for $ac_word" >&5
++echo "configure:1186: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MPIF77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1214,7 +1219,7 @@
+             # Extract the first word of "mpif90", so it can be a program name with args.
+ set dummy mpif90; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1218: checking for $ac_word" >&5
++echo "configure:1223: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MPIF90'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1251,7 +1256,7 @@
+             # Extract the first word of "mpiCC", so it can be a program name with args.
+ set dummy mpiCC; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1255: checking for $ac_word" >&5
++echo "configure:1260: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MPICXX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1286,10 +1291,45 @@
+             TESTCXX=${CXX-CC}
+             CXX="$MPICXX"
+ 	    # We may want to restrict this to the path containing mpirun
++	    # Extract the first word of "mpiexec", so it can be a program name with args.
++set dummy mpiexec; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1298: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_MPIEXEC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case "$MPIEXEC" in
++  /*)
++  ac_cv_path_MPIEXEC="$MPIEXEC" # Let the user override the test with a path.
++  ;;
++  ?:/*)			 
++  ac_cv_path_MPIEXEC="$MPIEXEC" # Let the user override the test with a dos path.
++  ;;
++  *)
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do 
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_path_MPIEXEC="$ac_dir/$ac_word"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  ;;
++esac
++fi
++MPIEXEC="$ac_cv_path_MPIEXEC"
++if test -n "$MPIEXEC"; then
++  echo "$ac_t""$MPIEXEC" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
+ 	    # Extract the first word of "mpirun", so it can be a program name with args.
+ set dummy mpirun; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1293: checking for $ac_word" >&5
++echo "configure:1333: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MPIRUN'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1324,7 +1364,7 @@
+ 	    # Extract the first word of "mpichboot", so it can be a program name with args.
+ set dummy mpichboot; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1328: checking for $ac_word" >&5
++echo "configure:1368: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MPIBOOT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1359,7 +1399,7 @@
+ 	    # Extract the first word of "mpichstop", so it can be a program name with args.
+ set dummy mpichstop; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1363: checking for $ac_word" >&5
++echo "configure:1403: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MPIUNBOOT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1407,7 +1447,7 @@
+         save_LDFLAGS="$LDFLAGS"
+         LDFLAGS="$save_LDFLAGS -L$with_mpichnt/lib"
+         echo $ac_n "checking for MPI_Init in -lmpich""... $ac_c" 1>&6
+-echo "configure:1411: checking for MPI_Init in -lmpich" >&5
++echo "configure:1451: checking for MPI_Init in -lmpich" >&5
+ ac_lib_var=`echo mpich'_'MPI_Init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1415,7 +1455,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lmpich  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1419 "configure"
++#line 1459 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -1426,7 +1466,7 @@
+ MPI_Init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1449,7 +1489,7 @@
+ 
+         if test "$found" = "no" ; then
+           echo $ac_n "checking for MPI_Init in -lmpich2""... $ac_c" 1>&6
+-echo "configure:1453: checking for MPI_Init in -lmpich2" >&5
++echo "configure:1493: checking for MPI_Init in -lmpich2" >&5
+ ac_lib_var=`echo mpich2'_'MPI_Init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1457,7 +1497,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lmpich2  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1461 "configure"
++#line 1501 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -1468,7 +1508,7 @@
+ MPI_Init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1509,7 +1549,7 @@
+         # Extract the first word of "mpicc", so it can be a program name with args.
+ set dummy mpicc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1513: checking for $ac_word" >&5
++echo "configure:1553: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MPICC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1546,7 +1586,7 @@
+         # Extract the first word of "mpif77", so it can be a program name with args.
+ set dummy mpif77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1550: checking for $ac_word" >&5
++echo "configure:1590: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MPIF77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1583,7 +1623,7 @@
+         # Extract the first word of "mpif90", so it can be a program name with args.
+ set dummy mpif90; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1587: checking for $ac_word" >&5
++echo "configure:1627: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MPIF90'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1620,7 +1660,7 @@
+         # Extract the first word of "mpiCC", so it can be a program name with args.
+ set dummy mpiCC; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1624: checking for $ac_word" >&5
++echo "configure:1664: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MPICXX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1662,6 +1702,77 @@
+ 	;;
+ 
+ 	ibmmpi)
++	for ac_prog in mpcc
++do
++# Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1711: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_MPCC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$MPCC"; then
++  ac_cv_prog_MPCC="$MPCC" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_MPCC="$ac_prog"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++MPCC="$ac_cv_prog_MPCC"
++if test -n "$MPCC"; then
++  echo "$ac_t""$MPCC" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++test -n "$MPCC" && break
++done
++
++	for ac_prog in mpxlf
++do
++# Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1745: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_MPXLF'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$MPXLF"; then
++  ac_cv_prog_MPXLF="$MPXLF" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_MPXLF="$ac_prog"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++MPXLF="$ac_cv_prog_MPXLF"
++if test -n "$MPXLF"; then
++  echo "$ac_t""$MPXLF" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++test -n "$MPXLF" && break
++done
++
++	if test -z "$MPCC" -o -z "$MPXLF" ; then
++	    { echo "configure: error: Could not find IBM MPI compilation scripts.  Either mpcc or mpxlf is missing" 1>&2; exit 1; }
++	fi
+ 	TESTCC=${CC-xlC}; TESTF77=${F77-xlf}; CC=mpcc; F77=mpxlf
+ 	# There is no mpxlf90, but the options langlvl and free can
+ 	# select the F90 version of xlf
+@@ -1673,7 +1784,7 @@
+ 	TESTCC=${CC:=cc}; TESTF77=${F77:=f77}; 
+ 	TESTCXX=${CXX:=CC}; TESTF90=${F90:=f90}
+ 	echo $ac_n "checking for MPI_Init in -lmpi""... $ac_c" 1>&6
+-echo "configure:1677: checking for MPI_Init in -lmpi" >&5
++echo "configure:1788: checking for MPI_Init in -lmpi" >&5
+ ac_lib_var=`echo mpi'_'MPI_Init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1681,7 +1792,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lmpi  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1685 "configure"
++#line 1796 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -1692,7 +1803,7 @@
+ MPI_Init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1736,7 +1847,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1740: checking for $ac_word" >&5
++echo "configure:1851: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1767,7 +1878,7 @@
+ 
+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1882: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -1778,12 +1889,12 @@
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 1782 "configure"
++#line 1893 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -1809,12 +1920,12 @@
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1813: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1924: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether the C compiler sets its return status correctly""... $ac_c" 1>&6
+-echo "configure:1818: checking whether the C compiler sets its return status correctly" >&5
++echo "configure:1929: checking whether the C compiler sets its return status correctly" >&5
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -1824,14 +1935,14 @@
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 1828 "configure"
++#line 1939 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ int a = bzzzt;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   notbroken=no
+ else
+@@ -1848,7 +1959,7 @@
+ fi
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:1852: checking whether we are using GNU C" >&5
++echo "configure:1963: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1857,7 +1968,7 @@
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+ else
+   ac_cv_prog_gcc=no
+@@ -1880,7 +1991,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1884: checking for $ac_word" >&5
++echo "configure:1995: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1913,7 +2024,7 @@
+ fi
+ 
+ echo $ac_n "checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1917: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works" >&5
++echo "configure:2028: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=f
+ ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+@@ -1926,7 +2037,7 @@
+       end
+ 
+ EOF
+-if { (eval echo configure:1930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_f77_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -1952,12 +2063,12 @@
+   { echo "configure: error: installation or configuration problem: Fortran 77 compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1956: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2067: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_f77_cross" 1>&6
+ cross_compiling=$ac_cv_prog_f77_cross
+ 
+ echo $ac_n "checking whether we are using GNU Fortran 77""... $ac_c" 1>&6
+-echo "configure:1961: checking whether we are using GNU Fortran 77" >&5
++echo "configure:2072: checking whether we are using GNU Fortran 77" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_g77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1966,7 +2077,7 @@
+   yes
+ #endif
+ EOF
+-if { ac_try='$F77 -E conftest.fpp'; { (eval echo configure:1970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='$F77 -E conftest.fpp'; { (eval echo configure:2081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_g77=yes
+ else
+   ac_cv_prog_g77=no
+@@ -1981,7 +2092,7 @@
+   ac_save_FFLAGS="$FFLAGS"
+   FFLAGS=
+   echo $ac_n "checking whether $F77 accepts -g""... $ac_c" 1>&6
+-echo "configure:1985: checking whether $F77 accepts -g" >&5
++echo "configure:2096: checking whether $F77 accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_f77_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2018,7 +2129,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2022: checking for $ac_word" >&5
++echo "configure:2133: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2050,7 +2161,7 @@
+ 
+ 
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:2054: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:2165: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -2061,12 +2172,12 @@
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 2065 "configure"
++#line 2176 "configure"
+ #include "confdefs.h"
+ 
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:2070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cxx_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -2092,12 +2203,12 @@
+   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:2096: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2207: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+-echo "configure:2101: checking whether we are using GNU C++" >&5
++echo "configure:2212: checking whether we are using GNU C++" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2106,7 +2217,7 @@
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gxx=yes
+ else
+   ac_cv_prog_gxx=no
+@@ -2125,7 +2236,7 @@
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS=
+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-echo "configure:2129: checking whether ${CXX-g++} accepts -g" >&5
++echo "configure:2240: checking whether ${CXX-g++} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2160,12 +2271,12 @@
+ 	if test "$enable_f90" != no ; then
+ 	    
+ if test -z "$F90" ; then
+-    for ac_prog in f90 xlf90 pgf90 ifort epcf90 f95 fort xlf95 lf95 pathf90 g95 fc ifc efc
++    for ac_prog in f90 xlf90 pgf90 ifort epcf90 f95 fort xlf95 lf95 pathf90 g95 gfortran ifc efc
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2169: checking for $ac_word" >&5
++echo "configure:2280: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F90'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2198,14 +2309,14 @@
+ fi
+ if test -n "$F90" ; then
+      echo $ac_n "checking for extension for Fortran 90 programs""... $ac_c" 1>&6
+-echo "configure:2202: checking for extension for Fortran 90 programs" >&5
++echo "configure:2313: checking for extension for Fortran 90 programs" >&5
+ pac_cv_f90_ext="f90"
+ cat > conftest.$pac_cv_f90_ext <<EOF
+       program conftest
+       end
+ EOF
+ ac_compile='${F90-f90} -c $F90FLAGS conftest.$pac_cv_f90_ext 1>&5'
+-if { (eval echo configure:2209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } ; then
++if { (eval echo configure:2320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } ; then
+     echo "$ac_t""f90" 1>&6
+ else
+     rm -f conftest*
+@@ -2214,14 +2325,14 @@
+       program conftest
+       end
+ EOF
+-    if { (eval echo configure:2218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } ; then
++    if { (eval echo configure:2329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } ; then
+ 	echo "$ac_t""f" 1>&6
+     else
+         echo "$ac_t""unknown!" 1>&6
+     fi
+ fi
+ echo $ac_n "checking whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:2225: checking whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) works" >&5
++echo "configure:2336: checking whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) works" >&5
+ 
+ # We cannot use _LANG_FORTRAN90 here because we will usually be executing this
+ # test in the context of _PROG_F90, which is a require on _LANG_FORTRAN90.
+@@ -2229,7 +2340,6 @@
+ ac_ext=$pac_cv_f90_ext
+ ac_compile='${F90-f90} -c $F90FLAGS conftest.$ac_ext 1>&5'
+ ac_link='${F90-f90} -o conftest${ac_exeext} $F90FLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$pac_cv_prog_f90_cross
+ # Include a Fortran 90 construction to distinguish between Fortran 77 
+ # and Fortran 90 compilers.
+ cat >conftest.$ac_ext <<EOF
+@@ -2237,7 +2347,7 @@
+       integer, dimension(10) :: n
+       end
+ EOF
+-if { (eval echo configure:2241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeect} ; then
++if { (eval echo configure:2351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeect} ; then
+     pac_cv_prog_f90_works="yes"
+     if (./conftest; exit) 2>/dev/null ; then
+         pac_cv_prog_f90_cross="no"
+@@ -2264,9 +2374,8 @@
+   echo "configure: warning: installation or configuration problem: Fortran 90 compiler cannot create executables." 1>&2
+ fi
+ echo $ac_n "checking whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:2268: checking whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2378: checking whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$pac_cv_prog_f90_cross" 1>&6
+-cross_compiling=$pac_cv_prog_f90_cross
+ 
+ fi
+ ac_f90ext=$pac_cv_f90_ext
+@@ -2313,7 +2422,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2317: checking for $ac_word" >&5
++echo "configure:2426: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2344,7 +2453,7 @@
+ 
+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:2348: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:2457: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -2355,12 +2464,12 @@
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 2359 "configure"
++#line 2468 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:2364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -2386,12 +2495,12 @@
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:2390: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2499: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether the C compiler sets its return status correctly""... $ac_c" 1>&6
+-echo "configure:2395: checking whether the C compiler sets its return status correctly" >&5
++echo "configure:2504: checking whether the C compiler sets its return status correctly" >&5
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -2401,14 +2510,14 @@
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 2405 "configure"
++#line 2514 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ int a = bzzzt;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2412: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   notbroken=no
+ else
+@@ -2425,7 +2534,7 @@
+ fi
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:2429: checking whether we are using GNU C" >&5
++echo "configure:2538: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2434,7 +2543,7 @@
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+ else
+   ac_cv_prog_gcc=no
+@@ -2455,7 +2564,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2459: checking for $ac_word" >&5
++echo "configure:2568: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2488,7 +2597,7 @@
+ fi
+ 
+ echo $ac_n "checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:2492: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works" >&5
++echo "configure:2601: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=f
+ ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+@@ -2501,7 +2610,7 @@
+       end
+ 
+ EOF
+-if { (eval echo configure:2505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_f77_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -2527,12 +2636,12 @@
+   { echo "configure: error: installation or configuration problem: Fortran 77 compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:2531: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2640: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_f77_cross" 1>&6
+ cross_compiling=$ac_cv_prog_f77_cross
+ 
+ echo $ac_n "checking whether we are using GNU Fortran 77""... $ac_c" 1>&6
+-echo "configure:2536: checking whether we are using GNU Fortran 77" >&5
++echo "configure:2645: checking whether we are using GNU Fortran 77" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_g77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2541,7 +2650,7 @@
+   yes
+ #endif
+ EOF
+-if { ac_try='$F77 -E conftest.fpp'; { (eval echo configure:2545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='$F77 -E conftest.fpp'; { (eval echo configure:2654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_g77=yes
+ else
+   ac_cv_prog_g77=no
+@@ -2556,7 +2665,7 @@
+   ac_save_FFLAGS="$FFLAGS"
+   FFLAGS=
+   echo $ac_n "checking whether $F77 accepts -g""... $ac_c" 1>&6
+-echo "configure:2560: checking whether $F77 accepts -g" >&5
++echo "configure:2669: checking whether $F77 accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_f77_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2597,7 +2706,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2601: checking for $ac_word" >&5
++echo "configure:2710: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2630,7 +2739,7 @@
+ 
+ 
+ echo $ac_n "checking whether clock skew breaks make""... $ac_c" 1>&6
+-echo "configure:2634: checking whether clock skew breaks make" >&5
++echo "configure:2743: checking whether clock skew breaks make" >&5
+ if eval "test \"`echo '$''{'pac_cv_prog_make_found_clock_skew'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2659,7 +2768,7 @@
+ 
+ 
+ echo $ac_n "checking whether make supports include""... $ac_c" 1>&6
+-echo "configure:2663: checking whether make supports include" >&5
++echo "configure:2772: checking whether make supports include" >&5
+ if eval "test \"`echo '$''{'pac_cv_prog_make_include'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2692,7 +2801,7 @@
+ 
+ 
+ echo $ac_n "checking whether make allows comments in actions""... $ac_c" 1>&6
+-echo "configure:2696: checking whether make allows comments in actions" >&5
++echo "configure:2805: checking whether make allows comments in actions" >&5
+ if eval "test \"`echo '$''{'pac_cv_prog_make_allows_comments'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2726,7 +2835,7 @@
+ 
+ 
+ echo $ac_n "checking for virtual path format""... $ac_c" 1>&6
+-echo "configure:2730: checking for virtual path format" >&5
++echo "configure:2839: checking for virtual path format" >&5
+ if eval "test \"`echo '$''{'pac_cv_prog_make_vpath'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2775,7 +2884,7 @@
+ 
+ 
+ echo $ac_n "checking whether make sets CFLAGS""... $ac_c" 1>&6
+-echo "configure:2779: checking whether make sets CFLAGS" >&5
++echo "configure:2888: checking whether make sets CFLAGS" >&5
+ if eval "test \"`echo '$''{'pac_cv_prog_make_set_cflags'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2806,7 +2915,7 @@
+ 
+ if test "$pac_cv_prog_make_echos_dir" = "no" ; then
+     echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-echo "configure:2810: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "configure:2919: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2843,7 +2952,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2847: checking for $ac_word" >&5
++echo "configure:2956: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_GRAPHICS_PGM'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2886,7 +2995,7 @@
+     pac_save_prog_f90_cross="$pac_cv_prog_f90_cross"
+     if test "X$CPP" = "X" ; then
+ 	echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:2890: checking how to run the C preprocessor" >&5
++echo "configure:2999: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -2901,13 +3010,13 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 2905 "configure"
++#line 3014 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -2918,13 +3027,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 2922 "configure"
++#line 3031 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -2935,13 +3044,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -nologo -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 2939 "configure"
++#line 3048 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -2987,20 +3096,20 @@
+   # not just through cpp.
+   TESTCPP="${TESTCC-cc} -E"
+   ac_try="$TESTCPP conftest.c >/dev/null 2>conftest.out"
+-  if { (eval echo configure:2991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ; then
++  if { (eval echo configure:3100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ; then
+       pac_cv_prog_TESTCPP="$TESTCPP"
+   fi
+   if test "X$pac_cv_prog_TESTCPP" = "X" ; then
+       TESTCPP="${TESTCC-cc} -E -traditional-cpp"
+       ac_try="$TESTCPP conftest.c >/dev/null 2>conftest.out"
+-      if { (eval echo configure:2997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ; then
++      if { (eval echo configure:3106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ; then
+           pac_cv_prog_TESTCPP="$TESTCPP"
+       fi
+   fi
+   if test "X$pac_cv_prog_TESTCPP" = "X" ; then
+       TESTCPP="${TESTCC-cc} -nologo -E"
+       ac_try="$TESTCPP conftest.c >/dev/null 2>conftest.out"
+-      if { (eval echo configure:3004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ; then
++      if { (eval echo configure:3113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ; then
+           pac_cv_prog_TESTCPP="$TESTCPP"
+       fi
+   fi
+@@ -3008,7 +3117,7 @@
+       # Extract the first word of "cpp", so it can be a program name with args.
+ set dummy cpp; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3012: checking for $ac_word" >&5
++echo "configure:3121: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_TESTCPP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3068,12 +3177,12 @@
+     else
+         cat > conftest.$ac_ext << EOF
+ 
+-#line 3072 "configure"
++#line 3181 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:3077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -3113,7 +3222,7 @@
+       end
+ 
+ EOF
+-if { (eval echo configure:3117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_f77_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -3148,12 +3257,12 @@
+ 
+         cat > conftest.$ac_ext << EOF
+ 
+-#line 3152 "configure"
++#line 3261 "configure"
+ #include "confdefs.h"
+ 
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:3157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cxx_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -3182,7 +3291,6 @@
+ ac_ext=$pac_cv_f90_ext
+ ac_compile='${F90-f90} -c $F90FLAGS conftest.$ac_ext 1>&5'
+ ac_link='${F90-f90} -o conftest${ac_exeext} $F90FLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$pac_cv_prog_f90_cross
+ 
+ 	        	if test "$pac_cross_compiling" = "yes" ; then
+ 	    ac_cv_prog_f90_cross=yes
+@@ -3225,7 +3333,7 @@
+     for copt in "-O4 -Ofast" "-Ofast" "-fast" "-O3" "-xO3" "-O" ; do
+         
+ echo $ac_n "checking whether C compiler accepts option $copt""... $ac_c" 1>&6
+-echo "configure:3229: checking whether C compiler accepts option $copt" >&5
++echo "configure:3337: checking whether C compiler accepts option $copt" >&5
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$copt $CFLAGS"
+ rm -f conftest.out
+@@ -3236,7 +3344,7 @@
+       if diff -b conftest.out conftest.bas >/dev/null 2>&1 ; then
+          echo "$ac_t""yes" 1>&6
+          echo $ac_n "checking whether routines compiled with $copt can be linked with ones compiled  without $copt""... $ac_c" 1>&6
+-echo "configure:3240: checking whether routines compiled with $copt can be linked with ones compiled  without $copt" >&5       
++echo "configure:3348: checking whether routines compiled with $copt can be linked with ones compiled  without $copt" >&5       
+          rm -f conftest.out
+          rm -f conftest.bas
+          if ${CC-cc} -c $save_CFLAGS $CPPFLAGS conftest2.c >conftest2.out 2>&1 ; then
+@@ -3304,7 +3412,7 @@
+ 		 "-funroll-loops" ; do
+ 	    
+ echo $ac_n "checking whether C compiler accepts option $copt""... $ac_c" 1>&6
+-echo "configure:3308: checking whether C compiler accepts option $copt" >&5
++echo "configure:3416: checking whether C compiler accepts option $copt" >&5
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$copt $CFLAGS"
+ rm -f conftest.out
+@@ -3315,7 +3423,7 @@
+       if diff -b conftest.out conftest.bas >/dev/null 2>&1 ; then
+          echo "$ac_t""yes" 1>&6
+          echo $ac_n "checking whether routines compiled with $copt can be linked with ones compiled  without $copt""... $ac_c" 1>&6
+-echo "configure:3319: checking whether routines compiled with $copt can be linked with ones compiled  without $copt" >&5       
++echo "configure:3427: checking whether routines compiled with $copt can be linked with ones compiled  without $copt" >&5       
+          rm -f conftest.out
+          rm -f conftest.bas
+          if ${CC-cc} -c $save_CFLAGS $CPPFLAGS conftest2.c >conftest2.out 2>&1 ; then
+@@ -3385,14 +3493,14 @@
+ 
+ 
+ echo $ac_n "checking for library containing fabs""... $ac_c" 1>&6
+-echo "configure:3389: checking for library containing fabs" >&5
++echo "configure:3497: checking for library containing fabs" >&5
+ if eval "test \"`echo '$''{'ac_cv_search_fabs'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_func_search_save_LIBS="$LIBS"
+ ac_cv_search_fabs="no"
+ cat > conftest.$ac_ext <<EOF
+-#line 3396 "configure"
++#line 3504 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3403,7 +3511,7 @@
+ fabs()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_fabs="none required"
+ else
+@@ -3414,7 +3522,7 @@
+ test "$ac_cv_search_fabs" = "no" && for i in m; do
+ LIBS="-l$i  $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3418 "configure"
++#line 3526 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3425,7 +3533,7 @@
+ fabs()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_fabs="-l$i"
+ break
+@@ -3460,14 +3568,14 @@
+   # Look for MPILIB first if it is defined
+   
+ echo $ac_n "checking for library containing MPI_Init""... $ac_c" 1>&6
+-echo "configure:3464: checking for library containing MPI_Init" >&5
++echo "configure:3572: checking for library containing MPI_Init" >&5
+ if eval "test \"`echo '$''{'ac_cv_search_MPI_Init'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_func_search_save_LIBS="$LIBS"
+ ac_cv_search_MPI_Init="no"
+ cat > conftest.$ac_ext <<EOF
+-#line 3471 "configure"
++#line 3579 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3478,7 +3586,7 @@
+ MPI_Init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_MPI_Init="none required"
+ else
+@@ -3489,7 +3597,7 @@
+ test "$ac_cv_search_MPI_Init" = "no" && for i in $MPILIB mpi mpich mpich2; do
+ LIBS="-l$i  $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3493 "configure"
++#line 3601 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3500,7 +3608,7 @@
+ MPI_Init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_MPI_Init="-l$i"
+ break
+@@ -3525,7 +3633,7 @@
+   fi
+   ac_safe=`echo "mpi.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for mpi.h""... $ac_c" 1>&6
+-echo "configure:3529: checking for mpi.h" >&5
++echo "configure:3637: checking for mpi.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3533,12 +3641,12 @@
+ pac_found_header=no
+ if test "$CPP" != "/lib/cpp" ; then
+     cat > conftest.$ac_ext <<EOF
+-#line 3537 "configure"
++#line 3645 "configure"
+ #include "confdefs.h"
+ #include <mpi.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -3553,13 +3661,13 @@
+ # If cpp failed, see if the compiler accepts the header.
+ if test "$pac_found_header" != "yes" ; then
+     cat >conftest.c<<EOF
+-#line 3557 "configure"
++#line 3665 "configure"
+ #include "confdefs.h"
+ #include <mpi.h>
+ int conftest() {return 0;}
+ EOF
+     ac_compile_for_cpp='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
+-    if { (eval echo configure:3563: \"$ac_compile_for_cpp\") 1>&5; (eval $ac_compile_for_cpp) 2>&5; }; then
++    if { (eval echo configure:3671: \"$ac_compile_for_cpp\") 1>&5; (eval $ac_compile_for_cpp) 2>&5; }; then
+ 	pac_found_header=yes
+     else
+         echo "configure: failed program was:" >&5
+@@ -3600,12 +3708,12 @@
+    for ac_func in MPI_Put MPI_Get
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3604: checking for $ac_func" >&5
++echo "configure:3712: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3609 "configure"
++#line 3717 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3628,7 +3736,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -3653,12 +3761,12 @@
+ done
+ 
+    echo $ac_n "checking for MPI_Alloc_mem""... $ac_c" 1>&6
+-echo "configure:3657: checking for MPI_Alloc_mem" >&5
++echo "configure:3765: checking for MPI_Alloc_mem" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_MPI_Alloc_mem'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3662 "configure"
++#line 3770 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char MPI_Alloc_mem(); below.  */
+@@ -3681,7 +3789,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_MPI_Alloc_mem=yes"
+ else
+@@ -3704,14 +3812,14 @@
+    if test "$found_alloc" != 1 -a "$ac_cv_func_MPI_Put" = "yes" ; then
+        
+ echo $ac_n "checking for library containing shmalloc""... $ac_c" 1>&6
+-echo "configure:3708: checking for library containing shmalloc" >&5
++echo "configure:3816: checking for library containing shmalloc" >&5
+ if eval "test \"`echo '$''{'ac_cv_search_shmalloc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_func_search_save_LIBS="$LIBS"
+ ac_cv_search_shmalloc="no"
+ cat > conftest.$ac_ext <<EOF
+-#line 3715 "configure"
++#line 3823 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3722,7 +3830,7 @@
+ shmalloc()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_shmalloc="none required"
+ else
+@@ -3733,7 +3841,7 @@
+ test "$ac_cv_search_shmalloc" = "no" && for i in sma; do
+ LIBS="-l$i  $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3737 "configure"
++#line 3845 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3744,7 +3852,7 @@
+ shmalloc()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_shmalloc="-l$i"
+ break
+@@ -3771,12 +3879,12 @@
+ fi
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:3775: checking for ANSI C header files" >&5
++echo "configure:3883: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3780 "configure"
++#line 3888 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -3784,7 +3892,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -3801,7 +3909,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 3805 "configure"
++#line 3913 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -3819,7 +3927,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 3823 "configure"
++#line 3931 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -3840,7 +3948,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3844 "configure"
++#line 3952 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -3851,7 +3959,7 @@
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:3855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -3878,7 +3986,7 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3882: checking for $ac_hdr" >&5
++echo "configure:3990: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3886,12 +3994,12 @@
+ pac_found_header=no
+ if test "$CPP" != "/lib/cpp" ; then
+     cat > conftest.$ac_ext <<EOF
+-#line 3890 "configure"
++#line 3998 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -3906,13 +4014,13 @@
+ # If cpp failed, see if the compiler accepts the header.
+ if test "$pac_found_header" != "yes" ; then
+     cat >conftest.c<<EOF
+-#line 3910 "configure"
++#line 4018 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ int conftest() {return 0;}
+ EOF
+     ac_compile_for_cpp='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
+-    if { (eval echo configure:3916: \"$ac_compile_for_cpp\") 1>&5; (eval $ac_compile_for_cpp) 2>&5; }; then
++    if { (eval echo configure:4024: \"$ac_compile_for_cpp\") 1>&5; (eval $ac_compile_for_cpp) 2>&5; }; then
+ 	pac_found_header=yes
+     else
+         echo "configure: failed program was:" >&5
+@@ -3942,12 +4050,12 @@
+ 
+ 
+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+-echo "configure:3946: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:4054: checking whether time.h and sys/time.h may both be included" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3951 "configure"
++#line 4059 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -3956,7 +4064,7 @@
+ struct tm *tp;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_time=yes
+ else
+@@ -3977,12 +4085,12 @@
+ fi
+ 
+ echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
+-echo "configure:3981: checking whether struct tm is in sys/time.h or time.h" >&5
++echo "configure:4089: checking whether struct tm is in sys/time.h or time.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3986 "configure"
++#line 4094 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <time.h>
+@@ -3990,7 +4098,7 @@
+ struct tm *tp; tp->tm_sec;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_tm=time.h
+ else
+@@ -4011,12 +4119,12 @@
+ fi
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:4015: checking for working const" >&5
++echo "configure:4123: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4020 "configure"
++#line 4128 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -4065,7 +4173,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -4088,20 +4196,20 @@
+ if test $use_restrict = "yes" ; then
+     
+ echo $ac_n "checking for restrict""... $ac_c" 1>&6
+-echo "configure:4092: checking for restrict" >&5
++echo "configure:4200: checking for restrict" >&5
+ if eval "test \"`echo '$''{'pac_cv_c_restrict'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 4098 "configure"
++#line 4206 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ int * restrict a;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   pac_cv_c_restrict="restrict"
+ else
+@@ -4113,14 +4221,14 @@
+ rm -f conftest*
+ if test "$pac_cv_c_restrict" = "no" ; then
+    cat > conftest.$ac_ext <<EOF
+-#line 4117 "configure"
++#line 4225 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ int * _Restrict a;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   pac_cv_c_restrict="_Restrict"
+ else
+@@ -4133,14 +4241,14 @@
+ fi
+ if test "$pac_cv_c_restrict" = "no" ; then
+    cat > conftest.$ac_ext <<EOF
+-#line 4137 "configure"
++#line 4245 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ int * __restrict a;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   pac_cv_c_restrict="__restrict"
+ else
+@@ -4174,16 +4282,16 @@
+ 
+ fi
+ echo $ac_n "checking for long long""... $ac_c" 1>&6
+-echo "configure:4178: checking for long long" >&5
++echo "configure:4286: checking for long long" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 4180 "configure"
++#line 4288 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ long long i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   have_long_long="yes"
+ else
+@@ -4388,13 +4496,18 @@
+ s%@CXX@%$CXX%g
+ s%@F77@%$F77%g
+ s%@F90@%$F90%g
++s%@MPIRUN_NP@%$MPIRUN_NP%g
++s%@MPIEXEC_N@%$MPIEXEC_N%g
+ s%@MPICC@%$MPICC%g
+ s%@MPIF77@%$MPIF77%g
+ s%@MPIF90@%$MPIF90%g
+ s%@MPICXX@%$MPICXX%g
++s%@MPIEXEC@%$MPIEXEC%g
+ s%@MPIRUN@%$MPIRUN%g
+ s%@MPIBOOT@%$MPIBOOT%g
+ s%@MPIUNBOOT@%$MPIUNBOOT%g
++s%@MPCC@%$MPCC%g
++s%@MPXLF@%$MPXLF%g
+ s%@FOPTIONS@%$FOPTIONS%g
+ s%@MAKE@%$MAKE%g
+ s%@VPATH@%$VPATH%g
+--- mpich-1.2.7.orig/examples/perftest/config/confdb/aclangf90.m4
++++ mpich-1.2.7/examples/perftest/config/confdb/aclangf90.m4
+@@ -194,7 +194,7 @@
+ _AC_ARG_VAR_LDFLAGS()dnl
+ AC_CHECK_TOOLS(F90,
+       [m4_default([$1],
+-                  [f95 f90 pgf90 ifort epcf90 fort xlf95 xlf90 xlf lf95 pathf90 g95 fc ifc efc])])
++                  [f95 f90 pgf90 ifort epcf90 fort xlf95 xlf90 xlf lf95 pathf90 g95 gfortran ifc efc])])
+ 
+ # Once we find the compiler, confirm the extension 
+ AC_MSG_CHECKING([that $ac_ext works as the extension for Fortran 90 program])
+@@ -1056,11 +1056,11 @@
+        program main
+        integer a
+        a = 1
+-       call t1(a)
++       call t1_2(a)
+        end
+ EOF
+ cat > conftest2.f <<EOF
+-       subroutine t1(b)
++       subroutine t1_2(b)
+        integer b
+        b = b + 1
+        end
+@@ -1129,7 +1129,11 @@
+ ac_ext=$pac_cv_f90_ext
+ ac_compile='${F90-f90} -c $F90FLAGS conftest.$ac_ext 1>&AC_FD_CC'
+ ac_link='${F90-f90} -o conftest${ac_exeext} $F90FLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
+-cross_compiling=$pac_cv_prog_f90_cross
++dnl cross_compiling no longer maintained by autoconf as part of the
++dnl AC_LANG changes.  If we set it here, a later AC_LANG may not 
++dnl restore it (in the case where one compiler claims to be a cross compiler
++dnl and another does not)
++dnl cross_compiling=$pac_cv_prog_f90_cross
+ # Include a Fortran 90 construction to distinguish between Fortran 77 
+ # and Fortran 90 compilers.
+ cat >conftest.$ac_ext <<EOF
+@@ -1159,7 +1163,11 @@
+ fi
+ AC_MSG_CHECKING([whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) is a cross-compiler])
+ AC_MSG_RESULT($pac_cv_prog_f90_cross)
+-cross_compiling=$pac_cv_prog_f90_cross
++dnl cross_compiling no longer maintained by autoconf as part of the
++dnl AC_LANG changes.  If we set it here, a later AC_LANG may not 
++dnl restore it (in the case where one compiler claims to be a cross compiler
++dnl and another does not)
++dnl cross_compiling=$pac_cv_prog_f90_cross
+ ])
+ dnl
+ dnl PAC_F90_AND_F77_COMPATIBLE([action-if-true],[action-if-false])
+--- mpich-1.2.7.orig/examples/perftest/config/confdb/aclocal_cc.m4
++++ mpich-1.2.7/examples/perftest/config/confdb/aclocal_cc.m4
+@@ -751,7 +751,34 @@
+ EOF
+     ac_link2='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest1.c conftest2.c $LIBS >conftest.out 2>&1'
+     if eval $ac_link2 ; then
+-        pac_cv_prog_c_weak_symbols="pragma weak"
++        # The gcc 3.4.x compiler accepts the pragma weak, but does not
++        # correctly implement it on systems where the loader doesn't 
++        # support weak symbols (e.g., cygwin).  This is a bug in gcc, but it
++        # it is one that *we* have to detect.
++        rm -f conftest*
++        cat >>conftest1.c <<EOF
++extern int PFoo(int);
++#pragma weak PFoo = Foo
++int Foo(int);
++int Foo(int a) { return a; }
++EOF
++    cat >>conftest2.c <<EOF
++extern int Foo(int);
++int PFoo(int a) { return a+1;}
++int main(int argc, char **argv) {
++return Foo(0);}
++EOF
++        if eval $ac_link2 ; then
++            pac_cv_prog_c_weak_symbols="pragma weak"
++        else 
++            echo "$ac_link2" >> config.log
++	    echo "Failed program was" >> config.log
++            cat conftest1.c >>config.log
++            cat conftest2.c >>config.log
++            if test -s conftest.out ; then cat conftest.out >> config.log ; fi
++            has_pragma_weak=0
++            pragma_extra_message="pragma weak accepted but does not work (probably creates two non-weak entries)"
++        fi
+     else
+       echo "$ac_link2" >>config.log
+       echo "Failed program was" >>config.log
+@@ -962,6 +989,8 @@
+ dnl here are some possible choices
+ dnl Solaris cc
+ dnl  -fd -v -Xc
++dnl -Xc is strict ANSI (some version) and does not allow "long long", for 
++dnl example
+ dnl IRIX
+ dnl  -ansi -DEBUG:trap_uninitialized=ON:varargs_interface_check=ON:verbose_runtime=ON
+ dnl
+@@ -1172,6 +1201,7 @@
+ ac_cv_prog_cc_globals_work,[
+ AC_REQUIRE([AC_PROG_RANLIB])
+ ac_cv_prog_cc_globals_work=no
++rm -f libconftest.a
+ echo 'extern int a; int a;' > conftest1.c
+ echo 'extern int a; int main( ){ return a; }' > conftest2.c
+ if ${CC-cc} $CFLAGS -c conftest1.c >conftest.out 2>&1 ; then
+@@ -1181,6 +1211,17 @@
+ 		# Success!  C works
+ 		ac_cv_prog_cc_globals_work=yes
+ 	    else
++		echo "Error linking program with uninitialized global" >&AC_FD_CC
++	        echo "Programs were:" >&AC_FD_CC
++		echo "conftest1.c:" >&AC_FD_CC
++                cat conftest1.c >&AC_FD_CC
++		echo "conftest2.c:" >&AC_FD_CC
++		cat conftest2.c >&AC_FD_CC
++		echo "and link line was:" >&AC_FD_CC
++		echo "${CC-cc} $CFLAGS -o conftest conftest2.c $LDFLAGS libconftest.a" >&AC_FD_CC
++		echo "with output:" >&AC_FD_CC
++		cat conftest.out >&AC_FD_CC
++
+ 	        # Failure!  Do we need -fno-common?
+ 	        ${CC-cc} $CFLAGS -fno-common -c conftest1.c >> conftest.out 2>&1
+ 		rm -f libconftest.a
+@@ -1191,7 +1232,9 @@
+ 		    CFLAGS="$CFLAGS -fno-common"
+                 elif test -n "$RANLIB" ; then 
+ 		    # Try again, with ranlib changed to ranlib -c
+-		    ${RANLIB} -c libconftest.a
++                    # (send output to /dev/null incase this ranlib
++                    # doesn't know -c)
++		    ${RANLIB} -c libconftest.a >/dev/null 2>&1
+ 		    if ${CC-cc} $CFLAGS -o conftest conftest2.c $LDFLAGS libconftest.a >> conftest.out 2>&1 ; then
+ 			RANLIB="$RANLIB -c"
+ 	 	    #else
+@@ -1450,6 +1493,13 @@
+   fprintf(f, "%d\n", sizeof(a) + sizeof(b));
+   exit(0);
+ }],AC_CV_NAME=`cat conftestval`,AC_CV_NAME=0,ifelse([$4],,,AC_CV_NAME=$4))])
++if test "X$AC_CV_NAME" = "X" ; then
++    # We have a problem.  The test returned a zero status, but no output,
++    # or we're cross-compiling (or think we are) and have no value for 
++    # this object
++    :
++fi
++rm -f conftestval
+ AC_MSG_RESULT($AC_CV_NAME)
+ dnl AC_DEFINE_UNQUOTED(AC_TYPE_NAME,$AC_CV_NAME)
+ undefine([AC_TYPE_NAME])undefine([AC_CV_NAME])
+--- mpich-1.2.7.orig/examples/perftest/config/confdb/aclocal_csharp.m4
++++ mpich-1.2.7/examples/perftest/config/confdb/aclocal_csharp.m4
+@@ -23,7 +23,11 @@
+ ac_ext=$pac_cv_csharp_ext
+ ac_compile='${CSHARP-csc} -c $CSFLAGS conftest.$ac_ext 1>&AC_FD_CC'
+ ac_link='${CSHARP-csc} -o conftest${ac_exeext} $CSFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
+-cross_compiling=$pac_cv_prog_csharp_cross
++dnl cross_compiling no longer maintained by autoconf as part of the
++dnl AC_LANG changes.  If we set it here, a later AC_LANG may not 
++dnl restore it (in the case where one compiler claims to be a cross compiler
++dnl and another does not)
++dnl cross_compiling=$pac_cv_prog_csharp_cross
+ ])
+ AC_DEFUN(PAC_PROG_CSHARP,[
+ if test -z "$CSHARP" ; then
+--- mpich-1.2.7.orig/examples/perftest/config/confdb/aclocal_f77.m4
++++ mpich-1.2.7/examples/perftest/config/confdb/aclocal_f77.m4
+@@ -124,11 +124,15 @@
+     *) AC_MSG_WARN([Unknown Fortran naming scheme]) ;;
+ esac
+ AC_SUBST(F77_NAME_MANGLE)
++# Get the standard call definition
++# FIXME: This should use F77_STDCALL, not STDCALL (non-conforming name)
+ if test "X$pac_cv_test_stdcall" = "X" ; then
+-        AC_DEFINE(STDCALL,,[Define calling convention])
++    F77_STDCALL=""
+ else
+-        AC_DEFINE(STDCALL,__stdcall,[Define calling convention])
++    F77_STDCALL="__stdcall"
+ fi
++# 
++AC_DEFINE_UNQUOTED(STDCALL,$F77_STDCALL,[Define calling convention])
+ ],[$1])
+ ])
+ dnl
+@@ -335,10 +339,9 @@
+ pac_cv_prog_f77_exclaim_comments,[
+ AC_LANG_SAVE
+ AC_LANG_FORTRAN77
+-AC_TRY_COMPILE(,[
+-!      This is a comment
+-],pac_cv_prog_f77_exclaim_comments="yes",
+-pac_cv_prog_f77_exclaim_comments="no")
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[!        This is a comment])],
++     pac_cv_prog_f77_exclaim_comments="yes",
++     pac_cv_prog_f77_exclaim_comments="no")
+ AC_LANG_RESTORE
+ ])
+ if test "$pac_cv_prog_f77_exclaim_comments" = "yes" ; then
+@@ -723,6 +726,13 @@
+ 		continue
+ 	   fi
+ 	   ;;
++	7) # gfortran won't find getarg if it is marked as external 
++	   FXX_MODULE=""
++	   F77_GETARGDECL="intrinsic GETARG"
++	   F77_GETARG="call GETARG(i,s)"
++	   F77_IARGC="IARGC()"
++	   MSG="intrinsic GETARG and IARGC"
++	   ;;
+         *) # exit from while loop
+ 	   FXX_MODULE=""
+ 	   F77_GETARGDECL=""
+@@ -854,8 +864,11 @@
+     ac_fcompileforlib='${F77-f77} -c $FFLAGS conftest1.f 1>&AC_FD_CC'
+     if AC_TRY_EVAL(ac_fcompileforlib) && test -s conftest1.o ; then
+         if test ! -d conftest ; then mkdir conftest2 ; fi
+-	dnl Use arcmd incase AR is defined as "ar cr"
+-        AC_TRY_COMMAND(${ARCMD-"ar"} cr conftest2/libconftest.a conftest1.o)
++	# We have had some problems with "AR" set to "ar cr"; this is
++	# a user-error; AR should be set to just the program (plus
++	# any flags that affect the object file format, such as -X64 
++	# required for 64-bit objects in some versions of AIX).
++        AC_TRY_COMMAND(${AR-"ar"} cr conftest2/libconftest.a conftest1.o)
+         AC_TRY_COMMAND(${RANLIB-ranlib} conftest2/libconftest.a)
+         ac_fcompileldtest='${F77-f77} -o conftest $FFLAGS ${ldir}conftest2 conftest.f -lconftest $LDFLAGS 1>&AC_FD_CC'
+         for ldir in "-L" "-Wl,-L," ; do
+@@ -977,11 +990,13 @@
+ pac_cv_prog_f77_has_pointer,[
+ AC_LANG_SAVE
+ AC_LANG_FORTRAN77
+-AC_TRY_COMPILE(,[
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
+         integer M
+         pointer (MPTR,M)
+         data MPTR/0/
+-],pac_cv_prog_f77_has_pointer="yes",pac_cv_prog_f77_has_pointer="no")
++])],
++    pac_cv_prog_f77_has_pointer="yes",
++    pac_cv_prog_f77_has_pointer="no")
+ AC_LANG_RESTORE
+ ])
+ if test "$pac_cv_prog_f77_has_pointer" = "yes" ; then
+@@ -1161,9 +1176,14 @@
+         end
+ EOF
+ if AC_TRY_EVAL(ac_compile); then
+-    if ${F77} -o conftest conftest.o conftest1.o $LDFLAGS 2>&AC_FD_CC ; then
++    # We include $FFLAGS on the link line because this is 
++    # the way in which most of the configure tests run.  In particular,
++    # many users are used to using FFLAGS (and CFLAGS) to select
++    # different instruction sets, such as 64-bit with -xarch=v9 for 
++    # Solaris.
++    if ${F77} ${FFLAGS} -o conftest conftest.o conftest1.o $LDFLAGS 2>&AC_FD_CC ; then
+ 	AC_MSG_RESULT([Use Fortran to link programs])
+-    elif ${CC} -o conftest conftest.o conftest1.o $LDFLAGS $FLIBS 2>&AC_FD_CC ; then
++    elif ${CC} ${CFLAGS} -o conftest conftest.o conftest1.o $LDFLAGS $FLIBS 2>&AC_FD_CC ; then
+ 	AC_MSG_RESULT([Use C with FLIBS to link programs])
+ 	F77LINKER="$CC"
+         F77_LDFLAGS="$F77_LDFLAGS $FLIBS"
+@@ -1215,10 +1235,9 @@
+ pac_cv_prog_f77_new_char_decl,[
+ AC_LANG_SAVE
+ AC_LANG_FORTRAN77
+-AC_TRY_COMPILE(,[
+-        character (len=10) s
+-],pac_cv_prog_f77_new_char_decl="yes",
+-pac_cv_prog_f77_new_char_decl="no")
++AC_COMPILE_IFLESE([AC_LANG_PROGRAM(,[        character (len=10) s])],
++    pac_cv_prog_f77_new_char_decl="yes",
++    pac_cv_prog_f77_new_char_decl="no")
+ AC_LANG_RESTORE
+ ])
+ if test "$pac_cv_prog_f77_new_char_decl" = "yes" ; then
+--- mpich-1.2.7.orig/examples/perftest/config/confdb/aclocal_f90.m4
++++ mpich-1.2.7/examples/perftest/config/confdb/aclocal_f90.m4
+@@ -10,7 +10,11 @@
+ ac_ext=$pac_cv_f90_ext
+ ac_compile='${F90-f90} -c $F90FLAGS conftest.$ac_ext 1>&AC_FD_CC'
+ ac_link='${F90-f90} -o conftest${ac_exeext} $F90FLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
+-cross_compiling=$pac_cv_prog_f90_cross
++dnl cross_compiling no longer maintained by autoconf as part of the
++dnl AC_LANG changes.  If we set it here, a later AC_LANG may not 
++dnl restore it (in the case where one compiler claims to be a cross compiler
++dnl and another does not)
++dnl cross_compiling=$pac_cv_prog_f90_cross
+ ])
+ dnl
+ dnl This is an addition for AC_TRY_COMPILE, but for f90.  If the current 
+@@ -322,7 +326,7 @@
+ # ifc - An older Intel compiler
+ AC_DEFUN(PAC_PROG_F90,[
+ if test -z "$F90" ; then
+-    AC_CHECK_PROGS(F90,f90 xlf90 pgf90 ifort epcf90 f95 fort xlf95 lf95 pathf90 g95 fc ifc efc)
++    AC_CHECK_PROGS(F90,f90 xlf90 pgf90 ifort epcf90 f95 fort xlf95 lf95 pathf90 g95 gfortran ifc efc)
+     test -z "$F90" && AC_MSG_WARN([no acceptable Fortran 90 compiler found in \$PATH])
+ fi
+ if test -n "$F90" ; then
+@@ -382,7 +386,11 @@
+ ac_ext=$pac_cv_f90_ext
+ ac_compile='${F90-f90} -c $F90FLAGS conftest.$ac_ext 1>&AC_FD_CC'
+ ac_link='${F90-f90} -o conftest${ac_exeext} $F90FLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
+-cross_compiling=$pac_cv_prog_f90_cross
++dnl cross_compiling no longer maintained by autoconf as part of the
++dnl AC_LANG changes.  If we set it here, a later AC_LANG may not 
++dnl restore it (in the case where one compiler claims to be a cross compiler
++dnl and another does not)
++dnl cross_compiling=$pac_cv_prog_f90_cross
+ # Include a Fortran 90 construction to distinguish between Fortran 77 
+ # and Fortran 90 compilers.
+ cat >conftest.$ac_ext <<EOF
+@@ -412,7 +420,11 @@
+ fi
+ AC_MSG_CHECKING([whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) is a cross-compiler])
+ AC_MSG_RESULT($pac_cv_prog_f90_cross)
+-cross_compiling=$pac_cv_prog_f90_cross
++dnl cross_compiling no longer maintained by autoconf as part of the
++dnl AC_LANG changes.  If we set it here, a later AC_LANG may not 
++dnl restore it (in the case where one compiler claims to be a cross compiler
++dnl and another does not)
++dnl cross_compiling=$pac_cv_prog_f90_cross
+ ])
+ dnl
+ dnl This version uses a Fortran program to link programs.
+@@ -525,11 +537,11 @@
+        program main
+        integer a
+        a = 1
+-       call t1(a)
++       call t1_2(a)
+        end
+ EOF
+ cat > conftest2.f <<EOF
+-       subroutine t1(b)
++       subroutine t1_2(b)
+        integer b
+        b = b + 1
+        end
+--- mpich-1.2.7.orig/examples/perftest/config/confdb/aclocal_mpi.m4
++++ mpich-1.2.7/examples/perftest/config/confdb/aclocal_mpi.m4
+@@ -91,6 +91,7 @@
+ dnl+ \-\-with\-mpich[=path] - MPICH.  'path' is the location of MPICH commands
+ dnl. \-\-with\-ibmmpi - IBM MPI
+ dnl. \-\-with\-lammpi[=path] - LAM/MPI
++dnl. \-\-with\-mpichnt - MPICH NT
+ dnl- \-\-with\-sgimpi - SGI MPI
+ dnl If no type is selected, and a default ("mpich", "ibmmpi", or "sgimpi")
+ dnl is given, that type is used as if '--with-<default>' was given.
+@@ -101,6 +102,13 @@
+ dnl programs that may need to be run before and after running MPI programs.
+ dnl For example, 'MPIBOOT' may start demons necessary to run MPI programs and
+ dnl 'MPIUNBOOT' will stop those demons.
++dnl 
++dnl The two forms of the compilers are to allow for tests of the compiler
++dnl when the MPI version of the compiler creates executables that cannot
++dnl be run on the local system (for example, the IBM SP, where executables
++dnl created with mpcc will not run locally, but executables created
++dnl with xlc may be used to discover properties of the compiler, such as
++dnl the size of data types).
+ dnl
+ dnl See also:
+ dnl PAC_LANG_PUSH_COMPILERS, PAC_LIB_MPI
+@@ -137,6 +145,11 @@
+ if test "$ac_mpi_type" = "unknown" -a "$pac_lib_mpi_is_building" = "yes" ; then
+     ac_mpi_type="mpich"
+ fi
++# Set defaults
++MPIRUN_NP="-np "
++MPIEXEC_N="-n "
++AC_SUBST(MPIRUN_NP)
++AC_SUBST(MPIEXEC_N)
+ case $ac_mpi_type in
+ 	mpich)
+         dnl 
+@@ -165,6 +178,7 @@
+             TESTCXX=${CXX-CC}
+             CXX="$MPICXX"
+ 	    # We may want to restrict this to the path containing mpirun
++	    AC_PATH_PROG(MPIEXEC,mpiexec)
+ 	    AC_PATH_PROG(MPIRUN,mpirun)
+ 	    AC_PATH_PROG(MPIBOOT,mpichboot)
+ 	    AC_PATH_PROG(MPIUNBOOT,mpichstop)
+@@ -228,6 +242,11 @@
+ 	;;
+ 
+ 	ibmmpi)
++	AC_CHECK_PROGS(MPCC,mpcc)
++	AC_CHECK_PROGS(MPXLF,mpxlf)
++	if test -z "$MPCC" -o -z "$MPXLF" ; then
++	    AC_MSG_ERROR([Could not find IBM MPI compilation scripts.  Either mpcc or mpxlf is missing])
++	fi
+ 	TESTCC=${CC-xlC}; TESTF77=${F77-xlf}; CC=mpcc; F77=mpxlf
+ 	# There is no mpxlf90, but the options langlvl and free can
+ 	# select the F90 version of xlf
+--- mpich-1.2.7.orig/examples/perftest/config/confdb/aclocal_shl.m4
++++ mpich-1.2.7/examples/perftest/config/confdb/aclocal_shl.m4
+@@ -101,6 +101,9 @@
+         *CYGWIN*|*cygwin*)
+ 	AC_MSG_ERROR([You must specify --enable-sharedlibs=cygwin-gcc for Cygwin])
+ 	;;
++	*SunOS*)
++	AC_MSG_ERROR([You must specify --enable-sharedlibs=solaris-gcc for Solaris with gcc])
++	;;
+     esac
+     ;;
+ 
+@@ -158,6 +161,15 @@
+     C_LINKPATH_SHL="-R"
+     enable_sharedlibs="solaris-cc"
+     ;;
++
++    solaris-gcc)
++    # This is the same as gcc, except for the C_LINKPATH_SHL
++    AC_MSG_RESULT([Creating shared libraries using Solaris with gcc])
++    C_LINK_SHL='${CC} -shared'
++    CC_SHL='${CC} -fPIC'
++    C_LINKPATH_SHL="-R"
++    enable_sharedlibs="solaris-gcc"
++    ;;
+     *)
+     AC_MSG_ERROR([Unknown value $enable_sharedlibs for enable-sharedlibs])
+     enable_sharedlibs=no
+--- mpich-1.2.7.orig/examples/perftest/config/confdb/fortran90.m4
++++ mpich-1.2.7/examples/perftest/config/confdb/fortran90.m4
+@@ -250,6 +250,9 @@
+ # ifort is another name for the Inten f90 compiler
+ # efc - An older Intel compiler (?)
+ # ifc - An older Intel compiler
++# fc  - A compiler on some unknown system.  This has been removed because
++#       it may also be the name of a command for something other than
++#       the Fortran compiler (e.g., fc=file system check!)
+ AC_DEFUN([AC_PROG_F90],
+ [# This is the fortran90 version of f90 language support
+ AC_LANG_PUSH(Fortran 90)dnl
+@@ -258,7 +261,7 @@
+ _AC_ARG_VAR_LDFLAGS()dnl
+ AC_CHECK_TOOLS(F90,
+       [m4_default([$1],
+-                  [f90 xlf90 pgf90 ifort epcf90 f95 fort xlf95 lf95 pathf90 g95 fc ifc efc])])
++                  [f90 xlf90 pgf90 ifort epcf90 f95 fort xlf95 lf95 pathf90 g95 gfortran ifc efc])])
+ 
+ # once we find the compiler, confirm the extension 
+ AC_MSG_CHECKING([that $ac_ext works as the extension for Fortran 90 program])
+@@ -1111,7 +1114,9 @@
+ save_ac_f90ext=$ac_f90ext
+ ac_f90ext="f90"
+ AC_LANG_PUSH(Fortran 90)
+-AC_TRY_COMPILE(,,pac_cv_f90_ext_f90="yes",pac_cv_f90_ext_f90="no")
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,)],
++    pac_cv_f90_ext_f90="yes",
++    pac_cv_f90_ext_f90="no")
+ AC_LANG_POP
+ ])
+ if test "$pac_cv_f90_ext_f90" = "yes" ; then
+@@ -1138,11 +1143,11 @@
+        program main
+        integer a
+        a = 1
+-       call t1(a)
++       call t1_2(a)
+        end
+ EOF
+ cat > conftest2.f <<EOF
+-       subroutine t1(b)
++       subroutine t1_2(b)
+        integer b
+        b = b + 1
+        end
+@@ -1206,7 +1211,11 @@
+ ac_ext=$pac_cv_f90_ext
+ ac_compile='${F90-f90} -c $F90FLAGS conftest.$ac_ext 1>&AC_FD_CC'
+ ac_link='${F90-f90} -o conftest${ac_exeext} $F90FLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
+-cross_compiling=$pac_cv_prog_f90_cross
++dnl cross_compiling no longer maintained by autoconf as part of the
++dnl AC_LANG changes.  If we set it here, a later AC_LANG may not 
++dnl restore it (in the case where one compiler claims to be a cross compiler
++dnl and another does not)
++dnl cross_compiling=$pac_cv_prog_f90_cross
+ # Include a Fortran 90 construction to distinguish between Fortran 77 
+ # and Fortran 90 compilers.
+ cat >conftest.$ac_ext <<EOF
+@@ -1214,7 +1223,7 @@
+       integer, dimension(10) :: n
+       end
+ EOF
+-if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeect} ; then
++if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} ; then
+     pac_cv_prog_f90_works="yes"
+     if (./conftest; exit) 2>/dev/null ; then
+         pac_cv_prog_f90_cross="no"
+@@ -1236,5 +1245,9 @@
+ fi
+ AC_MSG_CHECKING([whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) is a cross-compiler])
+ AC_MSG_RESULT($pac_cv_prog_f90_cross)
+-cross_compiling=$pac_cv_prog_f90_cross
++dnl cross_compiling no longer maintained by autoconf as part of the
++dnl AC_LANG changes.  If we set it here, a later AC_LANG may not 
++dnl restore it (in the case where one compiler claims to be a cross compiler
++dnl and another does not)
++dnl cross_compiling=$pac_cv_prog_f90_cross
+ ])
+--- mpich-1.2.7.orig/examples/test/configure
++++ mpich-1.2.7/examples/test/configure
+@@ -307,8 +307,19 @@
+ 
+      -with-mpich=*|--with-mpich=*)
+         mpichpath=`echo A$arg | sed 's/A-*with-mpich=//'`
+-	MPIRUNARGS='"-mvhome"'
+-	MPIRUNMVBACK="-mvback"
++	# Let the user provide the top-level path for MPICH as well
++	# as the bin directory
++	if test ! -x "$mpichpath/mpicc" -a -x "$mpichpath/bin/mpicc" ; then
++	    mpichpath="$mpichpath/mpicc"
++	fi
++	# Check for mpiexec; if found, use it, otherwise, set MPICH-1 specific
++	# mpirun options
++        if test -x "$mpichpath/mpiexec" ; then
++	    MPIRUN="$mpichpath/mpiexec"
++        elif test -z "$MPIRUN" ; then
++	    MPIRUNARGS='"-mvhome"'
++	    MPIRUNMVBACK="-mvback"
++        fi
+ 	MPIINCDIR=$mpichpath/../include
+ 	;;
+      -mpi2)
+@@ -2433,9 +2444,6 @@
+ #
+ #
+ MPE_CFLAGS="$MPE_CFLAGS $DEFS"
+-if test -n "$MPILIBNAME" ; then
+-    LIB_LIST="$LIB_LIST -l$MPILIBNAME"
+-fi
+ 
+ #
+ # We can check for MPICH by trying to compile a program that uses MPICH_NAME
+@@ -2527,10 +2535,16 @@
+  return 0;
+ }
+ EOF
+-    if $MPICC -o conftest conftest.c $LIB_LIST >conftest.log 2>&1 ; then
+-	:
++    if test -n "$MPILIBNAME" ; then
++        TLIB_LIST="$LIB_LIST -l$MPILIBNAME"
++    fi
++    if $MPICC -o conftest conftest.c $LIB_LIST > conftest.log 2>&1 ; then
++        :
++    elif $MPICC -o conftest conftest.c $TLIB_LIST >conftest.log 2>&1 ; then
++        # Accept the -l$MPILIBNAME in the liblist
++        LIB_LIST=$TLIB_LIST
+     else
+-        # Try adding -lmpi
++        # Try adding -lmpi instead of $MPILIBNAME
+         rm conftest.log
+         if $MPICC -o conftest conftest.c $LIB_LIST -lmpi >conftest.log 2>&1 ; then
+             LIB_LIST="$LIB_LIST -lmpi"
+@@ -2540,7 +2554,10 @@
+ else
+ echo "$ac_t""Warning: Could not compile/link a program containing MPI_Init" 1>&1
+ fi
+-            if test -s conftest.log ; then cat conftest.out ; fi
++	    echo "Test program was:"
++	    cat conftest.c
++	    echo "Compiler output was:"
++            if test -s conftest.log ; then cat conftest.log ; fi
+         fi
+     fi
+     rm -f conftest*
+@@ -2933,7 +2950,7 @@
+   echo creating $file
+   rm -f $file
+   echo "# Generated automatically from `echo $file|sed 's|.*/||'`.in by configure." > $file
+-cat $top_srcdir/${file}.in | sed -e "
++  sed -e "
+ $prsub
+ $extrasub
+ s%@prefix@%$prefix%g
+@@ -2975,7 +2992,7 @@
+ s%@MPICH_VERSION@%$MPICH_VERSION%g
+ s%@MPIR_HOME@%$MPIR_HOME%g
+ s%@MPI_FOBJECTS@%$MPI_FOBJECTS%g
+-s%@MPIFDEP@%$MPIFDEP%g" | sed -e "
++s%@MPIFDEP@%$MPIFDEP%g
+ s%@MPILIBNAME@%$MPILIBNAME%g
+ s%@MPICC@%$MPICC%g
+ s%@MPIF77@%$MPIF77%g
+@@ -2990,7 +3007,7 @@
+ s%@LIBS@%$LIBS%g
+ s%@srcdir@%$srcdir%g
+ s%@DEFS@%$DEFS%
+-" >> $file
++" $top_srcdir/${file}.in >> $file
+ fi; done
+ 
+ 
+--- mpich-1.2.7.orig/examples/test/configure.in
++++ mpich-1.2.7/examples/test/configure.in
+@@ -319,8 +319,19 @@
+ 
+      -with-mpich=*|--with-mpich=*)
+         mpichpath=`echo A$arg | sed 's/A-*with-mpich=//'`
+-	MPIRUNARGS='"-mvhome"'
+-	MPIRUNMVBACK="-mvback"
++	# Let the user provide the top-level path for MPICH as well
++	# as the bin directory
++	if test ! -x "$mpichpath/mpicc" -a -x "$mpichpath/bin/mpicc" ; then
++	    mpichpath="$mpichpath/mpicc"
++	fi
++	# Check for mpiexec; if found, use it, otherwise, set MPICH-1 specific
++	# mpirun options
++        if test -x "$mpichpath/mpiexec" ; then
++	    MPIRUN="$mpichpath/mpiexec"
++        elif test -z "$MPIRUN" ; then
++	    MPIRUNARGS='"-mvhome"'
++	    MPIRUNMVBACK="-mvback"
++        fi
+ 	MPIINCDIR=$mpichpath/../include
+ 	;;
+      -mpi2)
+@@ -681,9 +692,6 @@
+ #
+ #
+ MPE_CFLAGS="$MPE_CFLAGS $DEFS"
+-if test -n "$MPILIBNAME" ; then
+-    LIB_LIST="$LIB_LIST -l$MPILIBNAME"
+-fi
+ 
+ #
+ # We can check for MPICH by trying to compile a program that uses MPICH_NAME
+@@ -705,16 +713,25 @@
+  return 0;
+ }
+ EOF
+-    if $MPICC -o conftest conftest.c $LIB_LIST >conftest.log 2>&1 ; then
+-	:
++    if test -n "$MPILIBNAME" ; then
++        TLIB_LIST="$LIB_LIST -l$MPILIBNAME"
++    fi
++    if $MPICC -o conftest conftest.c $LIB_LIST > conftest.log 2>&1 ; then
++        :
++    elif $MPICC -o conftest conftest.c $TLIB_LIST >conftest.log 2>&1 ; then
++        # Accept the -l$MPILIBNAME in the liblist
++        LIB_LIST=$TLIB_LIST
+     else
+-        # Try adding -lmpi
++        # Try adding -lmpi instead of $MPILIBNAME
+         rm conftest.log
+         if $MPICC -o conftest conftest.c $LIB_LIST -lmpi >conftest.log 2>&1 ; then
+             LIB_LIST="$LIB_LIST -lmpi"
+         else
+ 	    AC_MSG_WARN([Could not compile/link a program containing MPI_Init])
+-            if test -s conftest.log ; then cat conftest.out ; fi
++	    echo "Test program was:"
++	    cat conftest.c
++	    echo "Compiler output was:"
++            if test -s conftest.log ; then cat conftest.log ; fi
+         fi
+     fi
+     rm -f conftest*
+--- mpich-1.2.7.orig/examples/test/context/ictest2.c
++++ mpich-1.2.7/examples/test/context/ictest2.c
+@@ -1,3 +1,4 @@
++/* -*- Mode: C; c-basic-offset:4 ; -*- */
+ /* ictest2.c 
+    This is like ictest.c, but it creates communictors that are valid only
+    at the "leaders"; other members of the local communicator are NOT
+@@ -15,6 +16,8 @@
+ #include <stdio.h>
+ #include "test.h"
+ 
++int verbose = 0;
++
+ int main( int argc, char **argv )
+ {
+   int size, rank, key, lrank, rsize, result, remLeader = 0;
+@@ -41,14 +44,14 @@
+     if (key == 1) {
+ 	/* Odd rank communicator discarded */
+ 	MPI_Comm_free( &evenComm );
+-	}
+-
++    }
++    
+     /* Create the odd communicator */
+     MPI_Comm_split ( MPI_COMM_WORLD, key, rank, &oddComm );
+     if (key == 0) {
+ 	/* Even rank communicator discarded */
+ 	MPI_Comm_free( &oddComm );
+-	}
++    }
+ 
+     /* Create the odd + 0 communicator */
+     if (rank == 0) key = 1;
+@@ -56,58 +59,75 @@
+     if (key == 0) {
+ 	/* Even rank communicator discarded */
+ 	MPI_Comm_free( &remComm );
+-	}
++    }
+     else {
+ 	MPI_Comm_rank( remComm, &lrank );
+-	printf( "[%d] lrank in remComm is %d (color = %d, key=%d)\n", 
+-	        rank, lrank, rank, key );
+-	remLeader = (lrank == 0) ? 1 : 0;
++	if (verbose) {
++	    printf( "[%d] lrank in remComm is %d (color = %d, key=%d)\n", 
++		    rank, lrank, rank, key );
+ 	}
++	remLeader = (lrank == 0) ? 1 : 0;
++    }
+     /* Now, choose the local and remote communicators */
+     if (rank % 2) {
+ 	/* Odd */
+ 	myComm  = oddComm;
+-	}
++    }
+     else {
+ 	myComm  = evenComm;
+-	}
++    }
+ 
+     /* Check that the leader is who we think he is */
+     MPI_Comm_rank( myComm, &lrank );
+-    printf( "[%d] local rank is %d\n", rank, lrank );
++    if (verbose) {
++	printf( "[%d] local rank is %d\n", rank, lrank );
++    }
+     if (rank == 0) {
+ 	int trank;
+ 	MPI_Comm_rank( myComm, &trank );
+ 	if (trank != 0) {
+ 	    printf( "[%d] Comm split improperly ordered group (myComm)\n",
+ 		    rank );
+-	    }
++	    fflush(stdout);
++	    errors++;
++	}
+ 	MPI_Comm_rank( remComm, &trank );
+ 	if (trank != 0) {
+ 	    printf( "[%d] Comm split improperly ordered group (remComm)\n",
+ 		    rank );
+-	    }
++	    fflush(stdout);
++	    errors++;
+ 	}
+-    fflush(stdout);
++    }
+     /* Perform the intercomm create and test it */
+     /* local leader is first process in local_comm, i.e., has rank 0 */
+     /* remote leader is process 0 (if odd) or 1 (if even) in remComm */
+     MPI_Intercomm_create (myComm, 0, remComm, remLeader, 1, &myFirstComm );
+ /* temp */
+-    printf( "[%d] through intercom create\n", rank );
+-    fflush( stdout );
++    if (verbose) {
++	printf( "[%d] through intercom create\n", rank );
++	fflush( stdout );
++    }
+     MPI_Barrier( MPI_COMM_WORLD );
+-    printf( "[%d] through barrier at end of intercom create\n", rank );
++    if (verbose) {
++	printf( "[%d] through barrier at end of intercom create\n", rank );
++	fflush( stdout );
++    }
+ /* temp */
+ 
+     /* Try to dup this communicator */
+     MPI_Comm_dup ( myFirstComm, &mySecondComm );
+ 
+ /* temp */
+-    printf( "[%d] through comm dup\n", rank );
+-    fflush( stdout );
++    if (verbose) {
++	printf( "[%d] through comm dup\n", rank );
++	fflush( stdout );
++    }
+     MPI_Barrier( MPI_COMM_WORLD );
+-    printf( "[%d] through barrier at end of comm dup\n", rank );
++    if (verbose) {
++	printf( "[%d] through barrier at end of comm dup\n", rank );
++	fflush( stdout );
++    }
+ /* temp */
+ 
+     /* Each member shares data with his "partner".  Note that process 0 in
+@@ -116,9 +136,11 @@
+     MPI_Comm_rank( mySecondComm, &lrank );
+     MPI_Comm_remote_size( mySecondComm, &rsize );
+ 
+-    printf( "[%d] lrank in secondcomm is %d and remote size is %d\n", 
+-	   rank, lrank, rsize );
+-    fflush( stdout );
++    if (verbose) {
++	printf( "[%d] lrank in secondcomm is %d and remote size is %d\n", 
++		rank, lrank, rsize );
++	fflush( stdout );
++    }
+ 
+     /* Send key * size + rank in communicator */
+     if (lrank < rsize) {
+@@ -126,9 +148,11 @@
+       key     = rank % 2;
+       myval   = key * size + lrank;
+       hisval  = -1;
+-      printf( "[%d] exchanging %d with %d in intercomm\n", 
+-	     rank, myval, lrank );
+-      fflush( stdout );
++      if (verbose) {
++	  printf( "[%d] exchanging %d with %d in intercomm\n", 
++		  rank, myval, lrank );
++	  fflush( stdout );
++      }
+       MPI_Sendrecv (&myval,  1, MPI_INT, lrank, 0,
+                     &hisval, 1, MPI_INT, lrank, 0, mySecondComm, &status);
+       if (hisval != (lrank + (!key)*size)) {
+@@ -138,8 +162,10 @@
+ 	  }
+       }
+     
+-    if (errors)
+-      printf("[%d] Failed!\n",rank);
++    if (errors) {
++	printf("[%d] Failed!\n",rank);
++	fflush(stdout);
++    }
+ 
+     /* Key is 1 for oddComm, 0 for evenComm (note both contain 0 in WORLD) */
+     MPI_Intercomm_merge ( mySecondComm, key, &merge1 );
+@@ -155,7 +181,9 @@
+ 
+     /* Free communicators */
+     MPI_Comm_free( &myComm );
+-    MPI_Comm_free( &remComm );
++    /* remComm may have been freed above */
++    if (remComm != MPI_COMM_NULL) 
++	MPI_Comm_free( &remComm );
+     MPI_Comm_free( &myFirstComm );
+     MPI_Comm_free( &mySecondComm );
+     MPI_Comm_free( &merge1 );
+@@ -163,8 +191,9 @@
+     MPI_Comm_free( &merge3 );
+     MPI_Comm_free( &merge4 );
+   }
+-  else 
+-    printf("[%d] Failed - at least 2 nodes must be used\n",rank);
++  else {
++      printf("[%d] Failed - at least 2 nodes must be used\n",rank);
++  }
+ 
+   MPI_Barrier( MPI_COMM_WORLD );
+   MPI_Allreduce( &errors, &sum_errors, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD );
+@@ -172,20 +201,9 @@
+       printf( "%d errors on process %d\n", errors, rank );
+       }
+   else if (rank == 0) {
+-      printf( "Completed successfully\n" );
++      printf( " No Errors\n" );
+       }
+-  /* Finalize and end! */
+ 
+   MPI_Finalize();
+   return 0;
+ }
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+--- mpich-1.2.7.orig/examples/test/pt2pt/issendtest.c
++++ mpich-1.2.7/examples/test/pt2pt/issendtest.c
+@@ -51,11 +51,19 @@
+     Current_Test = "Testing timer";
+     t0 = MPI_Wtime();
+     if (t0 == 0 && MPI_Wtime() == 0) {
+-	fprintf( stderr, 
+-		 "MPI_WTIME is returning 0; a working value is needed\n\
++	int loopcount = 1000000;
++	/* This test is too severe (systems with fast 
++	   processors and large MPI_Wtick values can 
++	   fail.  Try harder to test MPI_Wtime */
++	while (loopcount-- && MPI_Wtime() == 0) ;
++	if (loopcount <= 0) {
++	    fprintf( stderr, 
++		     "MPI_WTIME is returning 0; a working value is needed\n\
+ for this test.\n" );
+-	Test_Failed(Current_Test);
+-	MPI_Abort( MPI_COMM_WORLD, 1 );
++	    Test_Failed(Current_Test);
++	    MPI_Abort( MPI_COMM_WORLD, 1 );
++	}
++	t0 = MPI_Wtime();
+     }
+     /* Test that the timer increases */
+     Current_Test = "Testing timer increases";
+--- mpich-1.2.7.orig/examples/test/pt2pt/order.c
++++ mpich-1.2.7/examples/test/pt2pt/order.c
+@@ -24,14 +24,18 @@
+     /* This test depends on a working wtime.  Make a simple check */
+     t0 = MPI_Wtime();
+     if (t0 == 0 && MPI_Wtime() == 0) {
+-	/* We MAY have a problem.  Check some more */
+-	for (a=0; a<1000; a++) t0 = MPI_Wtime();
+-	if (t0 == 0) {
++	int loopcount = 1000000;
++	/* This test is too severe (systems with fast 
++	   processors and large MPI_Wtick values can 
++	   fail.  Try harder to test MPI_Wtime */
++	while (loopcount-- && MPI_Wtime() == 0) ;
++	if (loopcount <= 0) {
+ 	    fprintf( stderr, 
+ 		     "MPI_WTIME is returning 0; a working value is needed\n\
+ for this test.\n" );
+ 	    MPI_Abort( MPI_COMM_WORLD, 1 );
+ 	}
++	t0 = MPI_Wtime();
+     }
+ 
+     easy = 1;
+--- mpich-1.2.7.orig/examples/test/pt2pt/runtests.in
++++ mpich-1.2.7/examples/test/pt2pt/runtests.in
+@@ -91,6 +91,8 @@
+ 
+ # If cannot run test, do that and exit
+ if [ $check_canrun = 1 ] ; then
++    # Make sure that we don't have an old file lying around
++    rm -f third third.o third.exe
+     MakeExe third
+     rm -f third.out
+     echo '*** Testing Unexpected messages ***' >> third.out
+--- mpich-1.2.7.orig/examples/test/pt2pt/ssendtest.c
++++ mpich-1.2.7/examples/test/pt2pt/ssendtest.c
+@@ -78,11 +78,19 @@
+             flag = 0;
+ 	    /* This test depends on a working wtime.  Make a simple check */
+ 	    if (t0 == 0 && MPI_Wtime() == 0) {
+-		fprintf( stderr, 
+-		 "MPI_WTIME is returning 0; a working value is needed\n\
++		int loopcount = 1000000;
++		/* This test is too severe (systems with fast 
++		   processors and large MPI_Wtick values can 
++		   fail.  Try harder to test MPI_Wtime */
++		while (loopcount-- && MPI_Wtime() == 0) ;
++		if (loopcount <= 0) {
++		    fprintf( stderr, 
++			     "MPI_WTIME is returning 0; a working value is needed\n\
+ for this test.\n" );
+-		Test_Failed(Current_Test);
+-		MPI_Abort( MPI_COMM_WORLD, 1 );
++		    Test_Failed(Current_Test);
++		    MPI_Abort( MPI_COMM_WORLD, 1 );
++		}
++		t0 = MPI_Wtime();
+ 	    }
+             while (MPI_Wtime() - t0 < MAX_TIME) {
+                 MPI_Iprobe( src, 2, MPI_COMM_WORLD, &flag, &status );
+--- mpich-1.2.7.orig/include/patchlevel.h
++++ mpich-1.2.7/include/patchlevel.h
+@@ -2,14 +2,14 @@
+ #define PATCHLEVEL_MAJOR 1
+ #define PATCHLEVEL_MINOR 2
+ #define PATCHLEVEL_SUBMINOR 7
+-#define PATCHLEVEL_STRING "1.2.7"
++#define PATCHLEVEL_STRING "1.2.7p1"
+ 
+ #define PATCHLEVEL_RELEASE_KIND "release first patches"
+ #ifndef PATCHLEVEL_RELEASE_DATE 
+ #ifdef RELEASE_DATE
+ #define PATCHLEVEL_RELEASE_DATE RELEASE_DATE
+ #else
+-#define PATCHLEVEL_RELEASE_DATE "$Date: 2005/06/22 16:33:49$"
++#define PATCHLEVEL_RELEASE_DATE "$Date: 2005/11/04 11:54:51$"
+ #endif
+ #endif
+ 
+--- mpich-1.2.7.orig/man/man3/MPI_Waitsome.3
++++ mpich-1.2.7/man/man3/MPI_Waitsome.3
+@@ -1,4 +1,4 @@
+-.TH MPI_Waitsome 3 "1/9/2003" " " "MPI"
++.TH MPI_Waitsome 3 "8/15/2005" " " "MPI"
+ .SH NAME
+ MPI_Waitsome \-  Waits for some given communications to complete 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_close.3
++++ mpich-1.2.7/man/man3/MPI_File_close.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_close 3 "5/23/2005" " " "MPI-2"
++.TH MPI_File_close 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_close \-  Closes a file 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_delete.3
++++ mpich-1.2.7/man/man3/MPI_File_delete.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_delete 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_delete 3 "7/9/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_delete \-  Deletes a file 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_c2f.3
++++ mpich-1.2.7/man/man3/MPI_File_c2f.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_c2f 3 "10/4/2004" " " "MPI-2"
++.TH MPI_File_c2f 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_c2f \-  Translates a C file handle to a Fortran file handle 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_f2c.3
++++ mpich-1.2.7/man/man3/MPI_File_f2c.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_f2c 3 "10/4/2004" " " "MPI-2"
++.TH MPI_File_f2c 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_f2c \-  Translates a Fortran file handle to a C file handle 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_sync.3
++++ mpich-1.2.7/man/man3/MPI_File_sync.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_sync 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_sync 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_sync \-  Causes all previous writes to be transferred to the storage device 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_get_amode.3
++++ mpich-1.2.7/man/man3/MPI_File_get_amode.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_get_amode 3 "2/18/2005" " " "MPI-2"
++.TH MPI_File_get_amode 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_get_amode \-  Returns the file access mode 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_get_atomicity.3
++++ mpich-1.2.7/man/man3/MPI_File_get_atomicity.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_get_atomicity 3 "2/18/2005" " " "MPI-2"
++.TH MPI_File_get_atomicity 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_get_atomicity \-  Returns the atomicity mode 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_get_byte_offset.3
++++ mpich-1.2.7/man/man3/MPI_File_get_byte_offset.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_get_byte_offset 3 "5/23/2005" " " "MPI-2"
++.TH MPI_File_get_byte_offset 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_get_byte_offset \-  Returns the absolute byte position in  the file corresponding to "offset" etypes relative to the current view 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_get_errhandler.3
++++ mpich-1.2.7/man/man3/MPI_File_get_errhandler.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_get_errhandler 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_get_errhandler 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_get_errhandler \-  Returns the error handler for a file 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_get_type_extent.3
++++ mpich-1.2.7/man/man3/MPI_File_get_type_extent.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_get_type_extent 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_get_type_extent 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_get_type_extent \-  Returns the extent of datatype in the file 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_get_group.3
++++ mpich-1.2.7/man/man3/MPI_File_get_group.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_get_group 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_get_group 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_get_group \-  Returns the group of processes that  opened the file 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_get_info.3
++++ mpich-1.2.7/man/man3/MPI_File_get_info.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_get_info 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_get_info 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_get_info \-  Returns the hints for a file that are actually being used by MPI 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_get_position.3
++++ mpich-1.2.7/man/man3/MPI_File_get_position.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_get_position 3 "5/23/2005" " " "MPI-2"
++.TH MPI_File_get_position 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_get_position \-  Returns the current position of the  individual file pointer in etype units relative to the current view 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_get_position_shared.3
++++ mpich-1.2.7/man/man3/MPI_File_get_position_shared.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_get_position_shared 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_get_position_shared 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_get_position_shared \-  Returns the current position of the  shared file pointer in etype units relative to the current view 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_get_size.3
++++ mpich-1.2.7/man/man3/MPI_File_get_size.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_get_size 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_get_size 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_get_size \-  Returns the file size 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_get_view.3
++++ mpich-1.2.7/man/man3/MPI_File_get_view.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_get_view 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_get_view 3 "8/11/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_get_view \-  Returns the file view 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPIO_Request_c2f.3
++++ mpich-1.2.7/man/man3/MPIO_Request_c2f.3
+@@ -1,4 +1,4 @@
+-.TH MPIO_Request_c2f 3 "2/17/2005" " " "MPI-2"
++.TH MPIO_Request_c2f 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPIO_Request_c2f \-  Translates a C I/O-request handle to a  Fortran I/O-request handle 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPIO_Request_f2c.3
++++ mpich-1.2.7/man/man3/MPIO_Request_f2c.3
+@@ -1,4 +1,4 @@
+-.TH MPIO_Request_f2c 3 "2/17/2005" " " "MPI-2"
++.TH MPIO_Request_f2c 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPIO_Request_f2c \-  Translates a Fortran I/O-request handle to  a C I/O-request handle 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPIO_Test.3
++++ mpich-1.2.7/man/man3/MPIO_Test.3
+@@ -1,4 +1,4 @@
+-.TH MPIO_Test 3 "2/17/2005" " " "MPI-2"
++.TH MPIO_Test 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPIO_Test \-  Test the completion of a nonblocking read or write 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPIO_Wait.3
++++ mpich-1.2.7/man/man3/MPIO_Wait.3
+@@ -1,4 +1,4 @@
+-.TH MPIO_Wait 3 "2/17/2005" " " "MPI-2"
++.TH MPIO_Wait 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPIO_Wait \-  Waits for the completion of a nonblocking read or write 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_iread.3
++++ mpich-1.2.7/man/man3/MPI_File_iread.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_iread 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_iread 3 "9/10/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_iread \-  Nonblocking read using individual file pointer 
+ .SH SYNOPSIS
+@@ -6,8 +6,8 @@
+ #ifdef HAVE_MPI_GREQUEST
+ #include "mpiu_greq.h"
+ 
+-int MPI_File_iread(MPI_File mpi_fh, void *buf, int count, 
+-                  MPI_Datatype datatype, MPIO_Request *request)
++#if defined(HAVE_WINDOWS_H) && defined(USE_WIN_THREADED_IO)
++typedef struct iread_args
+ .fi
+ .SH INPUT PARAMETERS
+ .PD 0
+--- mpich-1.2.7.orig/man/man3/MPI_File_iread_at.3
++++ mpich-1.2.7/man/man3/MPI_File_iread_at.3
+@@ -1,13 +1,13 @@
+-.TH MPI_File_iread_at 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_iread_at 3 "9/10/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_iread_at \-  Nonblocking read using explict offset 
+ .SH SYNOPSIS
+ .nf
+ #ifdef HAVE_MPI_GREQUEST
+ #include "mpiu_greq.h"
+-int MPI_File_iread_at(MPI_File mpi_fh, MPI_Offset offset, void *buf,
+-                      int count, MPI_Datatype datatype, 
+-                      MPIO_Request *request)
++
++#if defined(HAVE_WINDOWS_H) && defined(USE_WIN_THREADED_IO)
++typedef struct iread_at_args
+ .fi
+ .SH INPUT PARAMETERS
+ .PD 0
+--- mpich-1.2.7.orig/man/man3/MPI_File_iread_shared.3
++++ mpich-1.2.7/man/man3/MPI_File_iread_shared.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_iread_shared 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_iread_shared 3 "9/10/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_iread_shared \-  Nonblocking read using shared file pointer 
+ .SH SYNOPSIS
+@@ -6,8 +6,8 @@
+ #ifdef HAVE_MPI_GREQUEST
+ #include "mpiu_greq.h"
+ 
+-int MPI_File_iread_shared(MPI_File mpi_fh, void *buf, int count, 
+-                        MPI_Datatype datatype, MPIO_Request *request)
++#if defined(HAVE_WINDOWS_H) && defined(USE_WIN_THREADED_IO)
++typedef struct iread_shared_args
+ .fi
+ .SH INPUT PARAMETERS
+ .PD 0
+--- mpich-1.2.7.orig/man/man3/MPI_File_iwrite.3
++++ mpich-1.2.7/man/man3/MPI_File_iwrite.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_iwrite 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_iwrite 3 "9/10/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_iwrite \-  Nonblocking write using individual file pointer 
+ .SH SYNOPSIS
+@@ -6,8 +6,8 @@
+ #ifdef HAVE_MPI_GREQUEST
+ #include "mpiu_greq.h"
+ 
+-int MPI_File_iwrite(MPI_File mpi_fh, void *buf, int count, 
+-                   MPI_Datatype datatype, MPIO_Request *request)
++#if defined(HAVE_WINDOWS_H) && defined(USE_WIN_THREADED_IO)
++typedef struct iwrite_args
+ .fi
+ .SH INPUT PARAMETERS
+ .PD 0
+--- mpich-1.2.7.orig/man/man3/MPI_File_iwrite_at.3
++++ mpich-1.2.7/man/man3/MPI_File_iwrite_at.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_iwrite_at 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_iwrite_at 3 "9/10/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_iwrite_at \-  Nonblocking write using explict offset 
+ .SH SYNOPSIS
+@@ -6,9 +6,8 @@
+ #ifdef HAVE_MPI_GREQUEST
+ #include "mpiu_greq.h"
+ 
+-int MPI_File_iwrite_at(MPI_File mpi_fh, MPI_Offset offset, void *buf,
+-                       int count, MPI_Datatype datatype, 
+-                       MPIO_Request *request)
++#if defined(HAVE_WINDOWS_H) && defined(USE_WIN_THREADED_IO)
++typedef struct iwrite_at_args
+ .fi
+ .SH INPUT PARAMETERS
+ .PD 0
+--- mpich-1.2.7.orig/man/man3/MPI_File_iwrite_shared.3
++++ mpich-1.2.7/man/man3/MPI_File_iwrite_shared.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_iwrite_shared 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_iwrite_shared 3 "9/10/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_iwrite_shared \-  Nonblocking write using shared file pointer 
+ .SH SYNOPSIS
+@@ -6,8 +6,8 @@
+ #ifdef HAVE_MPI_GREQUEST
+ #include "mpiu_greq.h"
+ 
+-int MPI_File_iwrite_shared(MPI_File mpi_fh, void *buf, int count, 
+-                         MPI_Datatype datatype, MPIO_Request *request)
++#if defined(HAVE_WINDOWS_H) && defined(USE_WIN_THREADED_IO)
++typedef struct iwrite_shared_args
+ .fi
+ .SH INPUT PARAMETERS
+ .PD 0
+--- mpich-1.2.7.orig/man/man3/MPI_File_open.3
++++ mpich-1.2.7/man/man3/MPI_File_open.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_open 3 "5/23/2005" " " "MPI-2"
++.TH MPI_File_open 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_open \-  Opens a file 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_preallocate.3
++++ mpich-1.2.7/man/man3/MPI_File_preallocate.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_preallocate 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_preallocate 3 "7/7/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_preallocate \-  Preallocates storage space for a file 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_read_at_all_begin.3
++++ mpich-1.2.7/man/man3/MPI_File_read_at_all_begin.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_read_at_all_begin 3 "10/4/2004" " " "MPI-2"
++.TH MPI_File_read_at_all_begin 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_read_at_all_begin \-  Begin a split collective read using explict offset 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_read_at_all_end.3
++++ mpich-1.2.7/man/man3/MPI_File_read_at_all_end.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_read_at_all_end 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_read_at_all_end 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_read_at_all_end \-  Complete a split collective read using explict offset 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_read_all_begin.3
++++ mpich-1.2.7/man/man3/MPI_File_read_all_begin.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_read_all_begin 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_read_all_begin 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_read_all_begin \-  Begin a split collective read using individual file pointer 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_read_all_end.3
++++ mpich-1.2.7/man/man3/MPI_File_read_all_end.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_read_all_end 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_read_all_end 3 "7/9/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_read_all_end \-  Complete a split collective read using individual file pointer 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_read_at_all.3
++++ mpich-1.2.7/man/man3/MPI_File_read_at_all.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_read_at_all 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_read_at_all 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_read_at_all \-  Collective read using explict offset 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_read_ordered.3
++++ mpich-1.2.7/man/man3/MPI_File_read_ordered.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_read_ordered 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_read_ordered 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_read_ordered \-  Collective read using shared file pointer 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_read_ordered_begin.3
++++ mpich-1.2.7/man/man3/MPI_File_read_ordered_begin.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_read_ordered_begin 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_read_ordered_begin 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_read_ordered_begin \-  Begin a split collective read using shared file pointer 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_read_ordered_end.3
++++ mpich-1.2.7/man/man3/MPI_File_read_ordered_end.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_read_ordered_end 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_read_ordered_end 3 "7/9/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_read_ordered_end \-  Complete a split collective read using shared file pointer 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_read_shared.3
++++ mpich-1.2.7/man/man3/MPI_File_read_shared.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_read_shared 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_read_shared 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_read_shared \-  Read using shared file pointer 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_Register_datarep.3
++++ mpich-1.2.7/man/man3/MPI_Register_datarep.3
+@@ -1,4 +1,4 @@
+-.TH MPI_Register_datarep 3 "5/23/2005" " " "MPI-2"
++.TH MPI_Register_datarep 3 "8/11/2005" " " "MPI-2"
+ .SH NAME
+ MPI_Register_datarep \-  Register functions for user-defined data  representations 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_seek.3
++++ mpich-1.2.7/man/man3/MPI_File_seek.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_seek 3 "5/23/2005" " " "MPI-2"
++.TH MPI_File_seek 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_seek \-  Updates the individual file pointer 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_set_atomicity.3
++++ mpich-1.2.7/man/man3/MPI_File_set_atomicity.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_set_atomicity 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_set_atomicity 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_set_atomicity \-  Sets the atomicity mode 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_set_errhandler.3
++++ mpich-1.2.7/man/man3/MPI_File_set_errhandler.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_set_errhandler 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_set_errhandler 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_set_errhandler \-  Sets the error handler for a file 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_set_info.3
++++ mpich-1.2.7/man/man3/MPI_File_set_info.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_set_info 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_set_info 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_set_info \-  Sets new values for the hints associated with a file 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_set_size.3
++++ mpich-1.2.7/man/man3/MPI_File_set_size.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_set_size 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_set_size 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_set_size \-  Sets the file size 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_set_view.3
++++ mpich-1.2.7/man/man3/MPI_File_set_view.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_set_view 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_set_view 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_set_view \-  Sets the file view 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_write_at_all_begin.3
++++ mpich-1.2.7/man/man3/MPI_File_write_at_all_begin.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_write_at_all_begin 3 "10/4/2004" " " "MPI-2"
++.TH MPI_File_write_at_all_begin 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_write_at_all_begin \-  Begin a split collective write using explict offset 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_write_at_all_end.3
++++ mpich-1.2.7/man/man3/MPI_File_write_at_all_end.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_write_at_all_end 3 "10/4/2004" " " "MPI-2"
++.TH MPI_File_write_at_all_end 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_write_at_all_end \-  Complete a split collective write using explict offset 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_write_all.3
++++ mpich-1.2.7/man/man3/MPI_File_write_all.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_write_all 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_write_all 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_write_all \-  Collective write using individual file pointer 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_write_all_begin.3
++++ mpich-1.2.7/man/man3/MPI_File_write_all_begin.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_write_all_begin 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_write_all_begin 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_write_all_begin \-  Begin a split collective write using individual file pointer 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_write_all_end.3
++++ mpich-1.2.7/man/man3/MPI_File_write_all_end.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_write_all_end 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_write_all_end 3 "7/9/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_write_all_end \-  Complete a split collective write using individual file pointer 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_write_at_all.3
++++ mpich-1.2.7/man/man3/MPI_File_write_at_all.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_write_at_all 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_write_at_all 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_write_at_all \-  Collective write using explict offset 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_write_ordered.3
++++ mpich-1.2.7/man/man3/MPI_File_write_ordered.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_write_ordered 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_write_ordered 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_write_ordered \-  Collective write using shared file pointer 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_write_ordered_begin.3
++++ mpich-1.2.7/man/man3/MPI_File_write_ordered_begin.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_write_ordered_begin 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_write_ordered_begin 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_write_ordered_begin \-  Begin a split collective write using shared file pointer 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_write_ordered_end.3
++++ mpich-1.2.7/man/man3/MPI_File_write_ordered_end.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_write_ordered_end 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_write_ordered_end 3 "7/9/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_write_ordered_end \-  Complete a split collective write using shared file pointer 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/man/man3/MPI_File_write_shared.3
++++ mpich-1.2.7/man/man3/MPI_File_write_shared.3
+@@ -1,4 +1,4 @@
+-.TH MPI_File_write_shared 3 "2/17/2005" " " "MPI-2"
++.TH MPI_File_write_shared 3 "6/8/2005" " " "MPI-2"
+ .SH NAME
+ MPI_File_write_shared \-  Write using shared file pointer 
+ .SH SYNOPSIS
+--- mpich-1.2.7.orig/mpid/ch2/Makefile.in
++++ mpich-1.2.7/mpid/ch2/Makefile.in
+@@ -1,5 +1,5 @@
+ #
+-#  $Id: Makefile.in,v 1.6 2004/08/11 15:30:20 gropp Exp $
++#  $Id: Makefile.in,v 1.7 2005/10/17 16:25:09 gropp Exp $
+ #
+ #  (C) 1993,1995 by Argonne National Laboratory and Mississipi State University.
+ #      All rights reserved.  See COPYRIGHT in top-level directory.
+@@ -43,7 +43,7 @@
+ # can speed up the build (ranlibs can take a LONG time).  profile_all 
+ # is the same, but for the profile library
+ default_all: $(MPI_OBJECTS)
+-	$(AR) $(LIBNAME) $?
++	$(AR) cr $(LIBNAME) $?
+ profile_all: 
+ 
+ $(MPI_OBJECTS): dev.h req.h mpid.h
+@@ -58,10 +58,10 @@
+ 	$(CC) $(CFLAGS) $(BASEOPT) -c -S $*.c $(MPI_PROFILE)
+ 
+ ../../build/$(ARCH)/$(DEVICE)/lib/lib@MPILIBNAME@.a: $(MPI_OBJECTS) 
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ libmpid.a: $(MPI_OBJECTS) 
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+--- mpich-1.2.7.orig/mpid/ch_cenju3/Makefile.in
++++ mpich-1.2.7/mpid/ch_cenju3/Makefile.in
+@@ -1,5 +1,5 @@
+ #
+-#  $Id: Makefile.in,v 1.7 2004/08/18 12:17:40 gropp Exp $
++#  $Id: Makefile.in,v 1.8 2005/10/17 16:25:09 gropp Exp $
+ #
+ #  (C) 1993,1995 by Argonne National Laboratory and Mississipi State University.
+ #      All rights reserved.  See COPYRIGHT in top-level directory.
+@@ -62,7 +62,7 @@
+ # can speed up the build (ranlibs can take a LONG time).  profile_all 
+ # is the same, but for the profile library
+ default_all: $(MPI_OBJECTS)
+-	$(AR) $(LIBNAME) $?
++	$(AR) cr $(LIBNAME) $?
+ profile_all: 
+ 
+ clean:
+@@ -99,11 +99,11 @@
+ 	$(ASM) -c $*.s
+ 
+ ../../build/$(ARCH)/$(DEVICE)/lib/lib@MPILIBNAME@.a: $(MPI_OBJECTS) 
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ libmpid.a: $(MPI_OBJECTS) mprerr.o
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ lint:
+--- mpich-1.2.7.orig/mpid/ch_lfshmem/Makefile.in
++++ mpich-1.2.7/mpid/ch_lfshmem/Makefile.in
+@@ -1,5 +1,5 @@
+ #
+-#  $Id: Makefile.in,v 1.10 2004/08/18 12:17:40 gropp Exp $
++#  $Id: Makefile.in,v 1.11 2005/10/17 16:25:10 gropp Exp $
+ #
+ #  (C) 1993,1995 by Argonne National Laboratory and Mississipi State University.
+ #      All rights reserved.  See COPYRIGHT in top-level directory.
+@@ -70,7 +70,7 @@
+ # is the same, but for the profile library
+ default_all: setlinks default_files
+ default_files: $(MPI_OBJECTS)
+-	$(AR) $(LIBNAME) $?
++	$(AR) cr $(LIBNAME) $?
+ profile_all: 
+ 
+ clean:
+@@ -115,11 +115,11 @@
+ 	$(ASM) -o $*.o $*.s
+ 
+ ../../build/$(ARCH)/$(DEVICE)/lib/lib@MPILIBNAME@.a: $(MPI_OBJECTS) 
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ libmpid.a: $(MPI_OBJECTS) mprerr.o
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ lint:
+--- mpich-1.2.7.orig/mpid/ch_meiko/Makefile.in
++++ mpich-1.2.7/mpid/ch_meiko/Makefile.in
+@@ -1,5 +1,5 @@
+ #
+-#  $Id: Makefile.in,v 1.5 2004/08/11 15:30:21 gropp Exp $
++#  $Id: Makefile.in,v 1.6 2005/10/17 16:25:10 gropp Exp $
+ #
+ #  (C) 1993 by Argonne National Laboratory and Mississipi State University.
+ #      All rights reserved.  See COPYRIGHT in top-level directory.
+@@ -36,9 +36,9 @@
+ # can speed up the build (ranlibs can take a LONG time).  profile_all 
+ # is the same, but for the profile library
+ default_all: $(MPI_OBJECTS)
+-	$(AR) ../../build/$(ARCH)/$(DEVICE)/lib/lib@MPILIBNAME@.a $?
++	$(AR) cr ../../build/$(ARCH)/$(DEVICE)/lib/lib@MPILIBNAME@.a $?
+ profile_all: $(MPI_OBJECTS)
+-	$(AR) ../../build/$(ARCH)/$(DEVICE)/lib/libp@MPILIBNAME@.a $?
++	$(AR) cr ../../build/$(ARCH)/$(DEVICE)/lib/libp@MPILIBNAME@.a $?
+ 
+ clean:
+ 	rm -f *~ $(MPI_OBJECTS) 
+@@ -47,7 +47,7 @@
+ 	$(CC) $(CFLAGS) $(BASEOPT) -c $*.c $(MPI_PROFILE)
+ 
+ ../../build/$(ARCH)/$(DEVICE)/lib/lib@MPILIBNAME@.a: $(MPI_OBJECTS) 
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ 
+--- mpich-1.2.7.orig/mpid/ch_mpl/Makefile.in
++++ mpich-1.2.7/mpid/ch_mpl/Makefile.in
+@@ -1,5 +1,5 @@
+ #
+-#  $Id: Makefile.in,v 1.20 2004/08/18 12:17:41 gropp Exp $
++#  $Id: Makefile.in,v 1.21 2005/10/17 16:25:10 gropp Exp $
+ #
+ #  (C) 1993,1995 by Argonne National Laboratory and Mississipi State University.
+ #      All rights reserved.  See COPYRIGHT in top-level directory.
+@@ -63,7 +63,7 @@
+ # is the same, but for the profile library
+ default_all: setlinks default_files
+ default_files: $(MPI_OBJECTS)
+-	$(AR) $(LIBNAME) $?
++	$(AR) cr $(LIBNAME) $?
+ profile_all: 
+ 
+ distclean:
+@@ -134,11 +134,11 @@
+ 	autoconf   --localdir=/home/gropp/sowing-proj/sowing/confdb
+ 
+ ${libbuild_dir}/lib@MPILIBNAME@.a: $(MPI_OBJECTS) 
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ libmpid.a: $(MPI_OBJECTS) mprerr.o
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ #
+--- mpich-1.2.7.orig/mpid/ch_nx/Makefile.in
++++ mpich-1.2.7/mpid/ch_nx/Makefile.in
+@@ -1,5 +1,5 @@
+ #
+-#  $Id: Makefile.in,v 1.9 2004/08/18 12:17:41 gropp Exp $
++#  $Id: Makefile.in,v 1.10 2005/10/17 16:25:10 gropp Exp $
+ #
+ #  (C) 1993,1995 by Argonne National Laboratory and Mississipi State University.
+ #      All rights reserved.  See COPYRIGHT in top-level directory.
+@@ -57,7 +57,7 @@
+ # is the same, but for the profile library
+ default_all: setlinks default_files
+ default_files: $(MPI_OBJECTS)
+-	$(AR) $(LIBNAME) $?
++	$(AR) cr $(LIBNAME) $?
+ profile_all: 
+ 
+ clean:
+@@ -98,11 +98,11 @@
+ 	$(CC) $(CFLAGS) $(BASEOPT) -c -S $*.c $(MPI_PROFILE)
+ 
+ ../../build/$(ARCH)/$(DEVICE)/lib/lib@MPILIBNAME@.a: $(MPI_OBJECTS) 
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ libmpid.a: $(MPI_OBJECTS) mprerr.o
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ lint:
+--- mpich-1.2.7.orig/mpid/ch_p4/Makefile.in
++++ mpich-1.2.7/mpid/ch_p4/Makefile.in
+@@ -1,5 +1,5 @@
+ #
+-#  $Id: Makefile.in,v 1.30 2004/08/18 12:17:41 gropp Exp $
++#  $Id: Makefile.in,v 1.31 2005/10/17 16:25:11 gropp Exp $
+ #
+ #  {C} 1993,1995 by Argonne National Laboratory and Mississipi State University.
+ #      All rights reserved.  See COPYRIGHT in top-level directory.
+@@ -62,7 +62,7 @@
+ # is the same, but for the profile library
+ default_all: setlinks p4inmpi default_all_files
+ default_all_files: ${MPI_OBJECTS}
+-	${AR} ${LIBNAME} $?
++	${AR} cr ${LIBNAME} $?
+ profile_all: 
+ 
+ # We need to clean the srcdir of any .o files because they can confuse the
+@@ -136,11 +136,11 @@
+ #	${CC} ${DEFS} ${CFLAGS} ${BASEOPT} -c -S $< ${MPI_PROFILE}
+ 
+ ${LIBNAME}: ${MPI_OBJECTS} 
+-	${AR} $@ $?
++	${AR} cr $@ $?
+ 	${RANLIB} $@
+ 
+ libmpid.a: ${MPI_OBJECTS} mprerr.o
+-	${AR} $@ $?
++	${AR} cr $@ $?
+ 	${RANLIB} $@
+ 
+ configure: configure.in ../../aclocal.m4
+--- mpich-1.2.7.orig/mpid/ch_p4/configure
++++ mpich-1.2.7/mpid/ch_p4/configure
+@@ -1281,15 +1281,16 @@
+ #line 1282 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-int main()
++#include <sys/types.h>
++main()
+ {
+   FILE *f=fopen("conftestval", "w");
+-  if (!f) return(1);
++  if (!f) exit(1);
+   fprintf(f, "%d\n", sizeof(int));
+-  return(0);
++  exit(0);
+ }
+ EOF
+-if { (eval echo configure:1293: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1294: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_int=`cat conftestval`
+ else
+@@ -1309,7 +1310,7 @@
+ 
+ 
+ echo $ac_n "checking size of long""... $ac_c" 1>&1
+-echo "configure:1313: checking size of long" >&2
++echo "configure:1314: checking size of long" >&2
+ if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&1
+ else
+@@ -1317,18 +1318,19 @@
+   ac_cv_sizeof_long=$CROSS_SIZEOF_LONG
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1321 "configure"
++#line 1322 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-int main()
++#include <sys/types.h>
++main()
+ {
+   FILE *f=fopen("conftestval", "w");
+-  if (!f) return(1);
++  if (!f) exit(1);
+   fprintf(f, "%d\n", sizeof(long));
+-  return(0);
++  exit(0);
+ }
+ EOF
+-if { (eval echo configure:1332: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1334: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_long=`cat conftestval`
+ else
+@@ -1351,9 +1353,9 @@
+ for ac_func in gettimeofday BSDgettimeofday
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&1
+-echo "configure:1355: checking for $ac_func" >&2
++echo "configure:1357: checking for $ac_func" >&2
+ cat > conftest.$ac_ext <<EOF
+-#line 1357 "configure"
++#line 1359 "configure"
+ #include "confdefs.h"
+ #include <ctype.h> /* Arbitrary system header to define __stub macros. */
+ #ifdef __cplusplus
+@@ -1374,7 +1376,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1378: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1380: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -1400,9 +1402,9 @@
+ for ac_func in setsid isatty
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&1
+-echo "configure:1404: checking for $ac_func" >&2
++echo "configure:1406: checking for $ac_func" >&2
+ cat > conftest.$ac_ext <<EOF
+-#line 1406 "configure"
++#line 1408 "configure"
+ #include "confdefs.h"
+ #include <ctype.h> /* Arbitrary system header to define __stub macros. */
+ #ifdef __cplusplus
+@@ -1423,7 +1425,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1427: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1429: \"$ac_link\") 1>&2; (eval $ac_link) 2>&2; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -1465,7 +1467,7 @@
+         # Extract the first word of "hostname", so it can be a program name with args.
+ set dummy hostname; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&1
+-echo "configure:1469: checking for $ac_word" >&2
++echo "configure:1471: checking for $ac_word" >&2
+ ac_prog_where=""
+ if test -n "$HOSTNAME_PGM"; then
+   ac_pg_HOSTNAME_PGM="$HOSTNAME_PGM" # Let the user override the test.
+--- mpich-1.2.7.orig/mpid/ch_p4/mpich-mpid.h.in
++++ mpich-1.2.7/mpid/ch_p4/mpich-mpid.h.in
+@@ -1,4 +1,4 @@
+-/* mpich-mpid.h.in.  Generated automatically from configure.in by autoheader.  */
++/* mpich-mpid.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
+ 
+ /* Define if mmap does not work correctly for anonymous memory */
+ #undef HAVE_NO_ANON_MMAP
+--- mpich-1.2.7.orig/mpid/ch_p4/mpirun.ch_p4.in
++++ mpich-1.2.7/mpid/ch_p4/mpirun.ch_p4.in
+@@ -24,7 +24,7 @@
+     fi
+     # Old server
+     if [ -r $HOME/.p4apps ] ; then
+-        if grep $progname $HOME/.p4apps > /dev/null 2>&1 ; then 
++        if grep "$progname" $HOME/.p4apps > /dev/null 2>&1 ; then 
+ 	    :
+ 	else 
+ 	    echo "$progname" >> $HOME/.p4apps
+@@ -68,20 +68,20 @@
+ # select a second network whose names are not those returned by
+ # "hostname".  For example, a system with a DEC Gigiswitch, Myricom 
+ # network, or IP over the IBM SP2 switch (HPS).
+-prognamemain=$progname
++prognamemain="$progname"
+ if [ -z "$p4pgfile"  ] ; then
+     p4pgfile="$PWD_TRIAL/PI$$"
+     # We need to explicitly redirect stderr.
+     # Under Solaris, an echo that fails aborts the script (!)  There is
+     # no way around this using echo, so we use cat instead.
+-    cat <<EOF 2>/dev/null > $p4pgfile
++    cat <<EOF 2>/dev/null > "$p4pgfile"
+ Test
+ EOF
+     if [ ! -s "$p4pgfile" ] ; then
+ 	# May not be able to write there.  Try the user's home directory
+-	p4pgfile=$HOME/PI$$
++	p4pgfile="$HOME/PI$$"
+     else
+-	rm -rf $p4pgfile
++	rm -rf "$p4pgfile"
+     fi
+     # cnt is the "index" into the list of machines
+     procNum=1
+@@ -95,8 +95,8 @@
+     fi
+     nprocval=`expr $nprocval - 1`
+     archval=$archlocal
+-    proginstance=`echo $progname | sed "s/%a/$archval/g"`
+-    prognamemain=$proginstance
++    proginstance="`echo "$progname" | sed "s/%a/$archval/g"`"
++    prognamemain="$proginstance"
+     if [ "$just_testing" = 1 ] ; then
+        echo "Procgroup file:"
+        if [ "$nolocal" = 0 ] ; then
+@@ -126,9 +126,9 @@
+ 	    else
+ 	        nprocval=`expr $nproclocal - 1`
+ 	    fi
+-	    echo "$MPI_HOST $nprocval $proginstance" > $p4pgfile
++	    echo "$MPI_HOST $nprocval $proginstance" > "$p4pgfile"
+        else
+-	    echo "$machinehead $nprocval $proginstance" > $p4pgfile
++	    echo "$machinehead $nprocval $proginstance" > "$p4pgfile"
+             procNum=2
+        fi
+     fi
+@@ -140,11 +140,11 @@
+ 	archval=`echo $archuselist | cut -d' ' -f$cnt`
+ 	nprocval=`echo $nprocuselist | cut -d' ' -f$cnt`
+ 	cnt=`expr $cnt + 1`
+-	proginstance=`echo $progname | sed "s/%a/$archval/g"`
++	proginstance="`echo "$progname" | sed "s/%a/$archval/g"`"
+ 	if [ $just_testing = 1 ] ; then
+-	    echo $machine $nprocval $proginstance
++	    echo "$machine $nprocval $proginstance"
+ 	else
+-	    echo $machine $nprocval $proginstance >> $p4pgfile
++	    echo "$machine $nprocval $proginstance" >> "$p4pgfile"
+ 	fi
+     done
+ 
+@@ -172,18 +172,18 @@
+ # given as command line argument
+ #
+ if [ "$p4workdir" = "" ] ; then
+-    p4workdir=$PWD_TRIAL
++    p4workdir="$PWD_TRIAL"
+ fi
+ #
+ # Having a p4pgfile_master allows us to move the pg file to a location
+ # where the master process can read it, even if the master does not
+ # share a file system with the process that mpirun is executing on 
+-p4pgfile_master=$p4pgfile
++p4pgfile_master="$p4pgfile"
+ if [ "$nolocal" = 1 -a "$move_pgfile_to_master" = "yes" ] ; then
+     # Should we use $TMPDIR  instead of /tmp here?
+     p4pgfile_master=/tmp/`basename $p4pgfile`
+ fi
+-startpgm="$prognamemain $cmdLineArgs -p4pg $p4pgfile_master -p4wd $p4workdir"
++startpgm="\"$prognamemain\" $cmdLineArgs -p4pg \"$p4pgfile_master\" -p4wd \"$p4workdir\""
+ # The following could use the -stdin filename from mpirun, though
+ # it doesn't handle the problem of the created jobs.
+ #if [ -n "$stdinfile" ] ; then
+@@ -204,7 +204,7 @@
+         export nolocal
+ 	export machinehead
+ 	export stdinfile
+-        $MPIRUN_HOME/mpirun_dbg.$debugger -progname $prognamemain -p4pg $p4pgfile_master -p4wd $p4workdir -cmdlineargs "$cmdLineArgs"
++        $MPIRUN_HOME/mpirun_dbg.$debugger -progname "$prognamemain" -p4pg "$p4pgfile_master" -p4wd "$p4workdir" -cmdlineargs "$cmdLineArgs"
+     else
+         echo "Cannot run debugger - no debugger script." 
+ 	exit 1
+@@ -237,10 +237,10 @@
+         fi
+     fi
+     if [ -n "$stdinfile" ] ; then
+-        $doitall $startpgm < $stdinfile
++        $doitall "$startpgm" < $stdinfile
+         exitstatus=$?
+     else
+-        $doitall $startpgm
++        $doitall "$startpgm"
+         exitstatus=$?
+     fi
+ fi
+@@ -251,7 +251,7 @@
+         fi
+     else
+         if [ "$nolocal" = 1 -a "$move_pgfile_to_master" = "yes" ] ; then
+-	    $rshcmd -n $machinehead /bin/rm $p4pgfile_master
++	    $rshcmd -n $machinehead /bin/rm "$p4pgfile_master"
+         fi
+         rm "$p4pgfile"
+     fi
+--- mpich-1.2.7.orig/mpid/ch_p4/p4/configure
++++ mpich-1.2.7/mpid/ch_p4/p4/configure
+@@ -482,6 +482,15 @@
+       DEFINE_SYSV_IPC="#define SYSV_IPC"
+     fi
+ fi
++#						PowerPC running Linux
++if test -n "$p4arch_LINUX_PPC"; then
++    # LINUX_PPC needs to be separate from LINUX because of 
++    # byte ordering
++    P4ARCH=LINUX_PPC
++    if test -n "$p4comm_shared"; then
++      DEFINE_SYSV_IPC="#define SYSV_IPC"
++    fi
++fi
+ 
+ #                                                Alpha running Linux
+ if test -n "$p4arch_LINUX_ALPHA"; then
+@@ -11801,7 +11810,7 @@
+   echo creating $file
+   rm -f $file
+   echo "# Generated automatically from `echo $file|sed 's|.*/||'`.in by configure." > $file
+-cat $top_srcdir/${file}.in | sed -e "
++  sed -e "
+ $prsub
+ $extrasub
+ s%@top_srcdir@%$top_srcdir%g
+@@ -11839,7 +11848,7 @@
+ s%@LIBS@%$LIBS%g
+ s%@srcdir@%$srcdir%g
+ s%@DEFS@%$DEFS%
+-" >> $file
++" $top_srcdir/${file}.in >> $file
+ fi; done
+ 
+ 
+--- mpich-1.2.7.orig/mpid/ch_p4/p4/configure.in
++++ mpich-1.2.7/mpid/ch_p4/p4/configure.in
+@@ -342,6 +342,15 @@
+       DEFINE_SYSV_IPC="#define SYSV_IPC"
+     fi
+ fi
++#						PowerPC running Linux
++if test -n "$p4arch_LINUX_PPC"; then
++    # LINUX_PPC needs to be separate from LINUX because of 
++    # byte ordering
++    P4ARCH=LINUX_PPC
++    if test -n "$p4comm_shared"; then
++      DEFINE_SYSV_IPC="#define SYSV_IPC"
++    fi
++fi
+ 
+ #                                                Alpha running Linux
+ if test -n "$p4arch_LINUX_ALPHA"; then
+--- mpich-1.2.7.orig/mpid/ch_p4/p4/usc/usc.h
++++ mpich-1.2.7/mpid/ch_p4/p4/usc/usc.h
+@@ -65,6 +65,17 @@
+ #endif
+ 
+ /* --------------------------------
++   Machine Synonyms
++   When P4 and the usc package were designed, there were no truely
++   portable operating systems, so using the OS name for the machine
++   was a 1-1 mapping.  With various Unix versions, particularly Linux, 
++   this is no longer true.
++   -------------------------------- */
++#if defined(LINUX_PPC) && !defined(LINUX)
++#define LINUX
++#endif
++
++/* --------------------------------
+  Machine dependent declarations
+ -------------------------------- */
+ 
+--- mpich-1.2.7.orig/mpid/ch_p4mpd/Makefile.in
++++ mpich-1.2.7/mpid/ch_p4mpd/Makefile.in
+@@ -1,5 +1,5 @@
+ #
+-#  $Id: Makefile.in,v 1.18 2004/08/18 12:17:42 gropp Exp $
++#  $Id: Makefile.in,v 1.19 2005/10/17 16:25:11 gropp Exp $
+ #
+ #  (C) 1993,1995 by Argonne National Laboratory and Mississipi State University.
+ #      All rights reserved.  See COPYRIGHT in top-level directory.
+@@ -71,7 +71,7 @@
+ # is the same, but for the profile library
+ default_all: setlinks p4inmpi default_all_files
+ default_all_files: $(MPI_OBJECTS)
+-	$(AR) $(LIBNAME) $?
++	$(AR) cr $(LIBNAME) $?
+ profile_all: 
+ 
+ clean:
+@@ -140,11 +140,11 @@
+ 	$(CC) $(CFLAGS) $(BASEOPT) -c -S $< $(MPI_PROFILE)
+ 
+ $(LIBNAME): $(MPI_OBJECTS) 
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ libmpid.a: $(MPI_OBJECTS) mprerr.o
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ configure: configure.in
+--- mpich-1.2.7.orig/mpid/ch_shmem/Makefile.in
++++ mpich-1.2.7/mpid/ch_shmem/Makefile.in
+@@ -1,6 +1,6 @@
+ 
+ #
+-#  $Id: Makefile.in,v 1.27 2004/08/18 12:17:42 gropp Exp $
++#  $Id: Makefile.in,v 1.28 2005/10/17 16:25:11 gropp Exp $
+ #
+ #  (C) 1993,1995 by Argonne National Laboratory and Mississipi State University.
+ #      All rights reserved.  See COPYRIGHT in top-level directory.
+@@ -80,7 +80,7 @@
+ # is the same, but for the profile library
+ default_all: setlinks default_files
+ default_files: $(MPI_OBJECTS)
+-	$(AR) $(LIBNAME) $?
++	$(AR) cr $(LIBNAME) $?
+ profile_all: 
+ 
+ clean:
+@@ -139,11 +139,11 @@
+ 	autoconf   --localdir=../..
+ 
+ ${libbuild_dir}/lib@MPILIBNAME@.a: $(MPI_OBJECTS) 
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ libmpid.a: $(MPI_OBJECTS) mprerr.o
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ 
+--- mpich-1.2.7.orig/mpid/ch_shmem/mpich-mpid.h.in
++++ mpich-1.2.7/mpid/ch_shmem/mpich-mpid.h.in
+@@ -1,4 +1,4 @@
+-/* mpich-mpid.h.in.  Generated automatically from configure.in by autoheader.  */
++/* mpich-mpid.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
+ 
+ /* Define as the return type of signal handlers (int or void).  */
+ #undef RETSIGTYPE
+--- mpich-1.2.7.orig/mpid/ch_shmem/shmemneager.c
++++ mpich-1.2.7/mpid/ch_shmem/shmemneager.c
+@@ -309,8 +309,8 @@
+ #ifdef LEAVE_IN_SHARED_MEM
+     rhandle->start        = address;
+ #else
+-    if (pkt->len > 0) {
+-	rhandle->start	  = (void *)MALLOC( pkt->len );
++    if (len > 0) {
++	rhandle->start	  = (void *)MALLOC( len );
+ 	rhandle->is_complete  = 1;
+ 	if (!rhandle->start) {
+ 	    rhandle->s.MPI_ERROR = MPI_ERR_INTERN;
+--- mpich-1.2.7.orig/mpid/globus2/Makefile.in
++++ mpich-1.2.7/mpid/globus2/Makefile.in
+@@ -1,5 +1,5 @@
+ #
+-#  $Id: Makefile.in,v 1.28 2002/11/01 20:07:28 karonis Exp $
++#  $Id: Makefile.in,v 1.29 2005/10/17 16:25:12 gropp Exp $
+ #
+ #  (C) 1993,1995 by Argonne National Laboratory and Mississipi State University.
+ #      All rights reserved.  See COPYRIGHT in top-level directory.
+@@ -73,7 +73,7 @@
+ # is the same, but for the profile library.  
+ 
+ default_all: $(MPI_OBJECTS)
+-	$(AR) $(LIBNAME) $(MPI_OBJECTS)
++	$(AR) cr $(LIBNAME) $(MPI_OBJECTS)
+ profile_all: 
+ 
+ #
+@@ -247,11 +247,11 @@
+ 	cia $(CIAS)
+ 
+ ${libbuild_dir}/lib@MPILIBNAME@.a: $(MPI_OBJECTS) 
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ libmpid.a: $(MPI_OBJECTS) 
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ FORCE:
+--- mpich-1.2.7.orig/mpid/globus2/install_globus2
++++ mpich-1.2.7/mpid/globus2/install_globus2
+@@ -25,24 +25,19 @@
+     CopyFile ${top_srcdir}/mpid/$DEVICE/global_c_symb.h ${includedir}
+     CopyFile ${top_srcdir}/mpid/$DEVICE/global_fort_symb.h ${includedir}
+ fi
+-CopyFile ${includebuild_dir}/mpid_fortdefs.h ${includedir}
++if test $F77_SED -ne 0 ; then
++    CopyFile ${top_srcdir}/mpid/$DEVICE/mpid_fortdefs.h  ${includedir}
++fi
+ 
+ #
+ # Correct paths in mpich compiler scripts
+ #
+-for file in ${bindir}/mpicc ${bindir}/mpiCC ${bindir}/mpicxx ${bindir}/mpif77 \
+-    ${bindir}/mpif90 ${sysconfdir}/mpicc.conf ${sysconfdir}/mpiCC.conf \
+-    ${sysconfdir}/mpicxx.conf ${sysconfdir}/mpif77.conf \
+-    ${sysconfdir}/mpif90.conf ${bindir}/mpireconfig ${bindir}/mpireconfig.dat \
+-    ${bindir}/mpirun
+-do
+-    if test -f ${file} ; then
+-        mv -f ${file} ${file}.tmp.$$
+-        sed -e '/^[ 	]*binbuild_dir[ 	]*=/!'" s!${binbuild_dir}!${bindir}!g" \
+-           ${file}.tmp.$$ >${file} 
+-	if test -x ${file}.tmp.$$ ; then
+-	    chmod $XMODE ${file}
+-	fi
+-        rm /${file}.tmp.$$
++for compiler in cc CC cxx f77 f90 ; do
++    if test -f ${bindir}/mpi${compiler} ; then
++        mv -f ${bindir}/mpi${compiler} ${bindir}/mpi${compiler}.orig
++        echo "rm ${bindir}/mpi${compiler}.orig" >> $UNINSTALLFILE
++        sed -e "s!BASE=\" *${binbuild_dir}!BASE=\"${bindir}!" \
++	    ${bindir}/mpi${compiler}.orig > ${bindir}/mpi${compiler}
++        chmod $XMODE ${bindir}/mpi${compiler}
+     fi
+ done
+--- mpich-1.2.7.orig/mpid/globus2/setup_globus2
++++ mpich-1.2.7/mpid/globus2/setup_globus2
+@@ -10,27 +10,6 @@
+ }
+ 
+ #
+-# mpidi_mkdir_p()
+-#
+-# Simulate "mkdir -p" since it is not available everywhere.  Portions
+-# of this code were taken from mpich2/confdb/aclocal.m4.
+-#
+-mpidi_mkdir_p()
+-{(
+-    saveIFS="${IFS}"
+-    IFS="/"
+-    tmp_curdir=""
+-    for tmp_subdir in $1 ; do
+-        tmp_curdir="${tmp_curdir}${tmp_subdir}"
+-        if test -n "${tmp_curdir}" -a ! -d "${tmp_curdir}" ; then
+-	    mkdir "${tmp_curdir}"
+-	fi
+-        tmp_curdir="${tmp_curdir}/"
+-    done
+-    IFS="${saveIFS}"
+-)}
+-
+-#
+ # Rename the MPICH libraries for G2 over vMPI-MPICH
+ #
+ MPILIBNAME="mpichg2"
+@@ -158,7 +137,6 @@
+     esac
+ done
+ 
+-mpidi_mkdir_p mpid/${DEVICE}
+ if test $globus_packaged -eq 0 ; then
+     if test -z "$GLOBUSDIR" ; then
+     	if test -x $GLOBUS_INSTALL_PATH/bin/globus-development-path ; then
+@@ -271,7 +249,6 @@
+ #
+ # We need to supply some header files to do the VMPI name transformations
+ #
+-mpidi_mkdir_p ${includebuild_dir}
+ if test $VMPI -ne 0 ; then
+     HAVE_MPID_DEFS_H=1
+     cp ${top_srcdir}/mpid/$DEVICE/mpid_defs.h ${includebuild_dir}
+@@ -285,14 +262,12 @@
+     # doing sed replacement causes some problems with F90 modules.
+     # we could probably fix this, but not before the first release. -- (Brian)
+     NO_F90=1
++    HAVE_MPID_FORTDEFS_H=1
++    export HAVE_MPID_FORTDEFS_H
++    cp ${top_srcdir}/mpid/$DEVICE/mpid_fortdefs.h \
++    	${builddir}/src/fortran/include
++    cp ${top_srcdir}/mpid/$DEVICE/mpid_fortdefs.h ${includebuild_dir}
+ fi
+-mpidi_mkdir_p ${builddir}/src/fortran/include
+-HAVE_MPID_FORTDEFS_H=1
+-export HAVE_MPID_FORTDEFS_H
+-sed -e "s!@F77_SED@!${F77_SED}!" ${top_srcdir}/mpid/$DEVICE/mpid_fortdefs.h.in \
+-    >${builddir}/src/fortran/include/mpid_fortdefs.h
+-sed -e "s!@F77_SED@!${F77_SED}!" ${top_srcdir}/mpid/$DEVICE/mpid_fortdefs.h.in \
+-    >${includebuild_dir}/mpid_fortdefs.h
+ 
+ #
+ # Get the libraries, etc (there's also a globuslibpath and globuslib)
+@@ -471,15 +446,15 @@
+ #
+ if test "$ARCH" = "rs6000" -a $VMPI -ne 0 ; then
+     if test "$globus_threads_enabled" = "yes" ; then    
+-    	GLOBUS_TEST_CLINKER=xlc_r
+-    	GLOBUS_TEST_CXXLINKER=xlC_r
+-    	GLOBUS_TEST_F77LINKER=xlf_r
+-    	GLOBUS_TEST_F90LINKER=xlf90_r
+-    else
+-    	GLOBUS_TEST_CLINKER=xlc
+-    	GLOBUS_TEST_CXXLINKER=xlC
+-    	GLOBUS_TEST_F77LINKER=xlf
+-    	GLOBUS_TEST_F90LINKER=xlf90
++    	GLOBUS_TEST_CLINKER="xlc_r`echo $GLOBUS_CLINKER | sed 's/[^ ]*//'`"
++    	GLOBUS_TEST_CXXLINKER="xlC_r`echo $GLOBUS_CXXLINKER | sed 's/[^ ]*//'`"
++    	GLOBUS_TEST_F77LINKER="xlf_r`echo $GLOBUS_F77LINKER | sed 's/[^ ]*//'`"
++    	GLOBUS_TEST_F90LINKER="xlf90_r`echo $GLOBUS_F90LINKER | sed 's/[^ ]*//'`"
++    else
++    	GLOBUS_TEST_CLINKER="xlc`echo $GLOBUS_CLINKER | sed 's/[^ ]*//'`"
++    	GLOBUS_TEST_CXXLINKER="xlC`echo $GLOBUS_CXXLINKER | sed 's/[^ ]*//'`"
++    	GLOBUS_TEST_F77LINKER="xlf`echo $GLOBUS_F77LINKER | sed 's/[^ ]*//'`"
++    	GLOBUS_TEST_F90LINKER="xlf90`echo $GLOBUS_F90LINKER | sed 's/[^ ]*//'`"
+     fi
+ fi
+ 
+@@ -495,7 +470,6 @@
+ #
+ # Create compiler scripts
+ #
+-mpidi_mkdir_p ${binbuild_dir}
+ sed -e "s!@GC@!$GLOBUS_CC!" \
+     -e "s!@GCFLAGS@!$GLOBUS_CFLAGS!" \
+     -e "s!@GL@!$GLOBUS_CLINKER!" \
+@@ -557,6 +531,58 @@
+ fi
+ 
+ #
++# The AIX "ar" command require the option "-X 64" when building 64-bit
++# libraries.  MPICH doesn't seem to do this detection for us, so we
++# must do it here.
++#
++if test "$ARCH" = "rs6000" -a $VMPI -ne 0 ; then
++    cat >conftest.c <<EOF
++int foo(int bar);
++
++int foo(int bar)
++{
++    return bar;
++}
++EOF
++    if test -z "$ac_echo_test" ; then
++	echo $ac_n "checking if ar requires -X64""... $ac_c"
++    else
++	echo $ac_n "determing if ar requires -X64""... $ac_c" 1>&1
++    fi
++    errmsg=""
++    if $CC -c conftest.c >>conftest.out 2>&1; then
++	test_XAR=`echo ${AR} | sed 's/ / -X64 /'`
++	if $AR conftest.a conftest.o >>conftest.out 2>&1 ; then
++	    result=no
++	elif $test_XAR conftest.a conftest.o >>conftest.out 2>&1 ; then
++	    result=yes
++	    AR=$test_XAR
++	    export AR
++	    ARCMD="ar -X64"
++	    export ARCMD
++	    ARNAME="ar -X64"
++	    export ARNAME
++	else
++	    result="all trials failed"
++	    errmsg="unable to build a library with ar"
++	fi
++    else
++	result="compile failure"
++	errmsg="unable to compile a simple program"
++    fi
++    if test -z "$ac_echo_test" ; then
++	echo "$ac_t""$result"
++    else
++	echo "$ac_t""$result" 1>&1
++    fi
++    if test -n "$errmsg" ; then
++	echo "ERROR: $errmsg"
++	exit 1
++    fi
++    rm -f conftest*
++fi
++
++#
+ # Figure out the size of a particular vendor's MPI type
+ #
+ get_vendor_size()
+@@ -670,7 +696,7 @@
+     #       it may be larger.
+     #
+     get_vendor_size MPI_Aint
+-    MPI_AINT_SIZE = $VENDOR_MPI_AINT_SIZE
++    MPI_AINT_SIZE=$VENDOR_MPI_AINT_SIZE
+ 
+     #
+     # If the vendor's MPI doesn't support MPI_LONG_LONG or MPI_LONG_LONG_INT
+--- mpich-1.2.7.orig/mpid/globus2/mpid_fortdefs.h
++++ mpich-1.2.7/mpid/globus2/mpid_fortdefs.h
+@@ -0,0 +1,2438 @@
++#if !defined(MPID_FORT_H)
++#define MPID_FORT_H
++
++
++
++/*
++ * This header file converts all MPI_ names into MPQ_ names, so that we avoid
++ * name clashing when using the vendor's MPI library.
++ *
++ * Based on a C hack by Warren Smith, extended to Fortran by Olle Larsson,
++ * updated and integrated in the MPICH distribution by Nick Karonis and
++ * Brian Toonen.
++ *
++ * This file is used only when you specify -f77sed during MPICH configuration,
++ * and under those circumstances, fortran90 will not work.  This file is
++ * intended to be used as a fallback position ... it is NOT our first
++ * choice.
++ *
++ */
++
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ISEND MPQ_ISEND
++#   define PMPI_ISEND PMPQ_ISEND
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_isend__ mpq_isend__
++#   define pmpi_isend__ pmpq_isend__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_isend mpq_isend
++#   define pmpi_isend pmpq_isend
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_isend_ mpq_isend_
++#   endif
++#   define pmpi_isend_ pmpq_isend_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_IRECV MPQ_IRECV
++#   define PMPI_IRECV PMPQ_IRECV
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_irecv__ mpq_irecv__
++#   define pmpi_irecv__ pmpq_irecv__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_irecv mpq_irecv
++#   define pmpi_irecv pmpq_irecv
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_irecv_ mpq_irecv_
++#   endif
++#   define pmpi_irecv_ pmpq_irecv_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_WAIT MPQ_WAIT
++#   define PMPI_WAIT PMPQ_WAIT
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_wait__ mpq_wait__
++#   define pmpi_wait__ pmpq_wait__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_wait mpq_wait
++#   define pmpi_wait pmpq_wait
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_wait_ mpq_wait_
++#   endif
++#   define pmpi_wait_ pmpq_wait_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TEST MPQ_TEST
++#   define PMPI_TEST PMPQ_TEST
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_test__ mpq_test__
++#   define pmpi_test__ pmpq_test__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_test mpq_test
++#   define pmpi_test pmpq_test
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_test_ mpq_test_
++#   endif
++#   define pmpi_test_ pmpq_test_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ADDRESS MPQ_ADDRESS
++#   define PMPI_ADDRESS PMPQ_ADDRESS
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_address__ mpq_address__
++#   define pmpi_address__ pmpq_address__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_address mpq_address
++#   define pmpi_address pmpq_address
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_address_ mpq_address_
++#   endif
++#   define pmpi_address_ pmpq_address_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_CANCEL MPQ_CANCEL
++#   define PMPI_CANCEL PMPQ_CANCEL
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_cancel__ mpq_cancel__
++#   define pmpi_cancel__ pmpq_cancel__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_cancel mpq_cancel
++#   define pmpi_cancel pmpq_cancel
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_cancel_ mpq_cancel_
++#   endif
++#   define pmpi_cancel_ pmpq_cancel_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_REQUEST_FREE MPQ_REQUEST_FREE
++#   define PMPI_REQUEST_FREE PMPQ_REQUEST_FREE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_request_free__ mpq_request_free__
++#   define pmpi_request_free__ pmpq_request_free__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_request_free mpq_request_free
++#   define pmpi_request_free pmpq_request_free
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_request_free_ mpq_request_free_
++#   endif
++#   define pmpi_request_free_ pmpq_request_free_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_PROBE MPQ_PROBE
++#   define PMPI_PROBE PMPQ_PROBE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_probe__ mpq_probe__
++#   define pmpi_probe__ pmpq_probe__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_probe mpq_probe
++#   define pmpi_probe pmpq_probe
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_probe_ mpq_probe_
++#   endif
++#   define pmpi_probe_ pmpq_probe_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_START MPQ_START
++#   define PMPI_START PMPQ_START
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_start__ mpq_start__
++#   define pmpi_start__ pmpq_start__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_start mpq_start
++#   define pmpi_start pmpq_start
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_start_ mpq_start_
++#   endif
++#   define pmpi_start_ pmpq_start_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TESTANY MPQ_TESTANY
++#   define PMPI_TESTANY PMPQ_TESTANY
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_testany__ mpq_testany__
++#   define pmpi_testany__ pmpq_testany__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_testany mpq_testany
++#   define pmpi_testany pmpq_testany
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_testany_ mpq_testany_
++#   endif
++#   define pmpi_testany_ pmpq_testany_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_WAITALL MPQ_WAITALL
++#   define PMPI_WAITALL PMPQ_WAITALL
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_waitall__ mpq_waitall__
++#   define pmpi_waitall__ pmpq_waitall__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_waitall mpq_waitall
++#   define pmpi_waitall pmpq_waitall
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_waitall_ mpq_waitall_
++#   endif
++#   define pmpi_waitall_ pmpq_waitall_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_SEND MPQ_SEND
++#   define PMPI_SEND PMPQ_SEND
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_send__ mpq_send__
++#   define pmpi_send__ pmpq_send__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_send mpq_send
++#   define pmpi_send pmpq_send
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_send_ mpq_send_
++#   endif
++#   define pmpi_send_ pmpq_send_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_RECV MPQ_RECV
++#   define PMPI_RECV PMPQ_RECV
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_recv__ mpq_recv__
++#   define pmpi_recv__ pmpq_recv__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_recv mpq_recv
++#   define pmpi_recv pmpq_recv
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_recv_ mpq_recv_
++#   endif
++#   define pmpi_recv_ pmpq_recv_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_SENDRECV MPQ_SENDRECV
++#   define PMPI_SENDRECV PMPQ_SENDRECV
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_sendrecv__ mpq_sendrecv__
++#   define pmpi_sendrecv__ pmpq_sendrecv__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_sendrecv mpq_sendrecv
++#   define pmpi_sendrecv pmpq_sendrecv
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_sendrecv_ mpq_sendrecv_
++#   endif
++#   define pmpi_sendrecv_ pmpq_sendrecv_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_IPROBE MPQ_IPROBE
++#   define PMPI_IPROBE PMPQ_IPROBE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_iprobe__ mpq_iprobe__
++#   define pmpi_iprobe__ pmpq_iprobe__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_iprobe mpq_iprobe
++#   define pmpi_iprobe pmpq_iprobe
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_iprobe_ mpq_iprobe_
++#   endif
++#   define pmpi_iprobe_ pmpq_iprobe_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TESTALL MPQ_TESTALL
++#   define PMPI_TESTALL PMPQ_TESTALL
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_testall__ mpq_testall__
++#   define pmpi_testall__ pmpq_testall__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_testall mpq_testall
++#   define pmpi_testall pmpq_testall
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_testall_ mpq_testall_
++#   endif
++#   define pmpi_testall_ pmpq_testall_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_WAITANY MPQ_WAITANY
++#   define PMPI_WAITANY PMPQ_WAITANY
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_waitany__ mpq_waitany__
++#   define pmpi_waitany__ pmpq_waitany__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_waitany mpq_waitany
++#   define pmpi_waitany pmpq_waitany
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_waitany_ mpq_waitany_
++#   endif
++#   define pmpi_waitany_ pmpq_waitany_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_RECV_INIT MPQ_RECV_INIT
++#   define PMPI_RECV_INIT PMPQ_RECV_INIT
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_recv_init__ mpq_recv_init__
++#   define pmpi_recv_init__ pmpq_recv_init__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_recv_init mpq_recv_init
++#   define pmpi_recv_init pmpq_recv_init
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_recv_init_ mpq_recv_init_
++#   endif
++#   define pmpi_recv_init_ pmpq_recv_init_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_SEND_INIT MPQ_SEND_INIT
++#   define PMPI_SEND_INIT PMPQ_SEND_INIT
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_send_init__ mpq_send_init__
++#   define pmpi_send_init__ pmpq_send_init__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_send_init mpq_send_init
++#   define pmpi_send_init pmpq_send_init
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_send_init_ mpq_send_init_
++#   endif
++#   define pmpi_send_init_ pmpq_send_init_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_SENDRECV_REPLACE MPQ_SENDRECV_REPLACE
++#   define PMPI_SENDRECV_REPLACE PMPQ_SENDRECV_REPLACE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_sendrecv_replace__ mpq_sendrecv_replace__
++#   define pmpi_sendrecv_replace__ pmpq_sendrecv_replace__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_sendrecv_replace mpq_sendrecv_replace
++#   define pmpi_sendrecv_replace pmpq_sendrecv_replace
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_sendrecv_replace_ mpq_sendrecv_replace_
++#   endif
++#   define pmpi_sendrecv_replace_ pmpq_sendrecv_replace_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GET_COUNT MPQ_GET_COUNT
++#   define PMPI_GET_COUNT PMPQ_GET_COUNT
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_get_count__ mpq_get_count__
++#   define pmpi_get_count__ pmpq_get_count__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_get_count mpq_get_count
++#   define pmpi_get_count pmpq_get_count
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_get_count_ mpq_get_count_
++#   endif
++#   define pmpi_get_count_ pmpq_get_count_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_BSEND MPQ_BSEND
++#   define PMPI_BSEND PMPQ_BSEND
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_bsend__ mpq_bsend__
++#   define pmpi_bsend__ pmpq_bsend__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_bsend mpq_bsend
++#   define pmpi_bsend pmpq_bsend
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_bsend_ mpq_bsend_
++#   endif
++#   define pmpi_bsend_ pmpq_bsend_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_SSEND MPQ_SSEND
++#   define PMPI_SSEND PMPQ_SSEND
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_ssend__ mpq_ssend__
++#   define pmpi_ssend__ pmpq_ssend__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_ssend mpq_ssend
++#   define pmpi_ssend pmpq_ssend
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_ssend_ mpq_ssend_
++#   endif
++#   define pmpi_ssend_ pmpq_ssend_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_RSEND MPQ_RSEND
++#   define PMPI_RSEND PMPQ_RSEND
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_rsend__ mpq_rsend__
++#   define pmpi_rsend__ pmpq_rsend__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_rsend mpq_rsend
++#   define pmpi_rsend pmpq_rsend
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_rsend_ mpq_rsend_
++#   endif
++#   define pmpi_rsend_ pmpq_rsend_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_BUFFER_ATTACH MPQ_BUFFER_ATTACH
++#   define PMPI_BUFFER_ATTACH PMPQ_BUFFER_ATTACH
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_buffer_attach__ mpq_buffer_attach__
++#   define pmpi_buffer_attach__ pmpq_buffer_attach__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_buffer_attach mpq_buffer_attach
++#   define pmpi_buffer_attach pmpq_buffer_attach
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_buffer_attach_ mpq_buffer_attach_
++#   endif
++#   define pmpi_buffer_attach_ pmpq_buffer_attach_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_BUFFER_DETACH MPQ_BUFFER_DETACH
++#   define PMPI_BUFFER_DETACH PMPQ_BUFFER_DETACH
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_buffer_detach__ mpq_buffer_detach__
++#   define pmpi_buffer_detach__ pmpq_buffer_detach__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_buffer_detach mpq_buffer_detach
++#   define pmpi_buffer_detach pmpq_buffer_detach
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_buffer_detach_ mpq_buffer_detach_
++#   endif
++#   define pmpi_buffer_detach_ pmpq_buffer_detach_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_IBSEND MPQ_IBSEND
++#   define PMPI_IBSEND PMPQ_IBSEND
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_ibsend__ mpq_ibsend__
++#   define pmpi_ibsend__ pmpq_ibsend__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_ibsend mpq_ibsend
++#   define pmpi_ibsend pmpq_ibsend
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_ibsend_ mpq_ibsend_
++#   endif
++#   define pmpi_ibsend_ pmpq_ibsend_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ISSEND MPQ_ISSEND
++#   define PMPI_ISSEND PMPQ_ISSEND
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_issend__ mpq_issend__
++#   define pmpi_issend__ pmpq_issend__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_issend mpq_issend
++#   define pmpi_issend pmpq_issend
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_issend_ mpq_issend_
++#   endif
++#   define pmpi_issend_ pmpq_issend_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_IRSEND MPQ_IRSEND
++#   define PMPI_IRSEND PMPQ_IRSEND
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_irsend__ mpq_irsend__
++#   define pmpi_irsend__ pmpq_irsend__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_irsend mpq_irsend
++#   define pmpi_irsend pmpq_irsend
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_irsend_ mpq_irsend_
++#   endif
++#   define pmpi_irsend_ pmpq_irsend_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_WAITSOME MPQ_WAITSOME
++#   define PMPI_WAITSOME PMPQ_WAITSOME
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_waitsome__ mpq_waitsome__
++#   define pmpi_waitsome__ pmpq_waitsome__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_waitsome mpq_waitsome
++#   define pmpi_waitsome pmpq_waitsome
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_waitsome_ mpq_waitsome_
++#   endif
++#   define pmpi_waitsome_ pmpq_waitsome_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TESTSOME MPQ_TESTSOME
++#   define PMPI_TESTSOME PMPQ_TESTSOME
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_testsome__ mpq_testsome__
++#   define pmpi_testsome__ pmpq_testsome__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_testsome mpq_testsome
++#   define pmpi_testsome pmpq_testsome
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_testsome_ mpq_testsome_
++#   endif
++#   define pmpi_testsome_ pmpq_testsome_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TEST_CANCELLED MPQ_TEST_CANCELLED
++#   define PMPI_TEST_CANCELLED PMPQ_TEST_CANCELLED
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_test_cancelled__ mpq_test_cancelled__
++#   define pmpi_test_cancelled__ pmpq_test_cancelled__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_test_cancelled mpq_test_cancelled
++#   define pmpi_test_cancelled pmpq_test_cancelled
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_test_cancelled_ mpq_test_cancelled_
++#   endif
++#   define pmpi_test_cancelled_ pmpq_test_cancelled_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_BSEND_INIT MPQ_BSEND_INIT
++#   define PMPI_BSEND_INIT PMPQ_BSEND_INIT
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_bsend_init__ mpq_bsend_init__
++#   define pmpi_bsend_init__ pmpq_bsend_init__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_bsend_init mpq_bsend_init
++#   define pmpi_bsend_init pmpq_bsend_init
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_bsend_init_ mpq_bsend_init_
++#   endif
++#   define pmpi_bsend_init_ pmpq_bsend_init_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_RSEND_INIT MPQ_RSEND_INIT
++#   define PMPI_RSEND_INIT PMPQ_RSEND_INIT
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_rsend_init__ mpq_rsend_init__
++#   define pmpi_rsend_init__ pmpq_rsend_init__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_rsend_init mpq_rsend_init
++#   define pmpi_rsend_init pmpq_rsend_init
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_rsend_init_ mpq_rsend_init_
++#   endif
++#   define pmpi_rsend_init_ pmpq_rsend_init_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_SSEND_INIT MPQ_SSEND_INIT
++#   define PMPI_SSEND_INIT PMPQ_SSEND_INIT
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_ssend_init__ mpq_ssend_init__
++#   define pmpi_ssend_init__ pmpq_ssend_init__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_ssend_init mpq_ssend_init
++#   define pmpi_ssend_init pmpq_ssend_init
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_ssend_init_ mpq_ssend_init_
++#   endif
++#   define pmpi_ssend_init_ pmpq_ssend_init_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_STARTALL MPQ_STARTALL
++#   define PMPI_STARTALL PMPQ_STARTALL
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_startall__ mpq_startall__
++#   define pmpi_startall__ pmpq_startall__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_startall mpq_startall
++#   define pmpi_startall pmpq_startall
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_startall_ mpq_startall_
++#   endif
++#   define pmpi_startall_ pmpq_startall_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_COMMIT MPQ_TYPE_COMMIT
++#   define PMPI_TYPE_COMMIT PMPQ_TYPE_COMMIT
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_commit__ mpq_type_commit__
++#   define pmpi_type_commit__ pmpq_type_commit__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_commit mpq_type_commit
++#   define pmpi_type_commit pmpq_type_commit
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_commit_ mpq_type_commit_
++#   endif
++#   define pmpi_type_commit_ pmpq_type_commit_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_CONTIGUOUS MPQ_TYPE_CONTIGUOUS
++#   define PMPI_TYPE_CONTIGUOUS PMPQ_TYPE_CONTIGUOUS
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_contiguous__ mpq_type_contiguous__
++#   define pmpi_type_contiguous__ pmpq_type_contiguous__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_contiguous mpq_type_contiguous
++#   define pmpi_type_contiguous pmpq_type_contiguous
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_contiguous_ mpq_type_contiguous_
++#   endif
++#   define pmpi_type_contiguous_ pmpq_type_contiguous_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_EXTENT MPQ_TYPE_EXTENT
++#   define PMPI_TYPE_EXTENT PMPQ_TYPE_EXTENT
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_extent__ mpq_type_extent__
++#   define pmpi_type_extent__ pmpq_type_extent__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_extent mpq_type_extent
++#   define pmpi_type_extent pmpq_type_extent
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_extent_ mpq_type_extent_
++#   endif
++#   define pmpi_type_extent_ pmpq_type_extent_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_FREE MPQ_TYPE_FREE
++#   define PMPI_TYPE_FREE PMPQ_TYPE_FREE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_free__ mpq_type_free__
++#   define pmpi_type_free__ pmpq_type_free__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_free mpq_type_free
++#   define pmpi_type_free pmpq_type_free
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_free_ mpq_type_free_
++#   endif
++#   define pmpi_type_free_ pmpq_type_free_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_HINDEXED MPQ_TYPE_HINDEXED
++#   define PMPI_TYPE_HINDEXED PMPQ_TYPE_HINDEXED
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_hindexed__ mpq_type_hindexed__
++#   define pmpi_type_hindexed__ pmpq_type_hindexed__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_hindexed mpq_type_hindexed
++#   define pmpi_type_hindexed pmpq_type_hindexed
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_hindexed_ mpq_type_hindexed_
++#   endif
++#   define pmpi_type_hindexed_ pmpq_type_hindexed_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_HVECTOR MPQ_TYPE_HVECTOR
++#   define PMPI_TYPE_HVECTOR PMPQ_TYPE_HVECTOR
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_hvector__ mpq_type_hvector__
++#   define pmpi_type_hvector__ pmpq_type_hvector__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_hvector mpq_type_hvector
++#   define pmpi_type_hvector pmpq_type_hvector
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_hvector_ mpq_type_hvector_
++#   endif
++#   define pmpi_type_hvector_ pmpq_type_hvector_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_INDEXED MPQ_TYPE_INDEXED
++#   define PMPI_TYPE_INDEXED PMPQ_TYPE_INDEXED
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_indexed__ mpq_type_indexed__
++#   define pmpi_type_indexed__ pmpq_type_indexed__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_indexed mpq_type_indexed
++#   define pmpi_type_indexed pmpq_type_indexed
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_indexed_ mpq_type_indexed_
++#   endif
++#   define pmpi_type_indexed_ pmpq_type_indexed_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_LB MPQ_TYPE_LB
++#   define PMPI_TYPE_LB PMPQ_TYPE_LB
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_lb__ mpq_type_lb__
++#   define pmpi_type_lb__ pmpq_type_lb__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_lb mpq_type_lb
++#   define pmpi_type_lb pmpq_type_lb
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_lb_ mpq_type_lb_
++#   endif
++#   define pmpi_type_lb_ pmpq_type_lb_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_SIZE MPQ_TYPE_SIZE
++#   define PMPI_TYPE_SIZE PMPQ_TYPE_SIZE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_size__ mpq_type_size__
++#   define pmpi_type_size__ pmpq_type_size__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_size mpq_type_size
++#   define pmpi_type_size pmpq_type_size
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_size_ mpq_type_size_
++#   endif
++#   define pmpi_type_size_ pmpq_type_size_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_STRUCT MPQ_TYPE_STRUCT
++#   define PMPI_TYPE_STRUCT PMPQ_TYPE_STRUCT
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_struct__ mpq_type_struct__
++#   define pmpi_type_struct__ pmpq_type_struct__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_struct mpq_type_struct
++#   define pmpi_type_struct pmpq_type_struct
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_struct_ mpq_type_struct_
++#   endif
++#   define pmpi_type_struct_ pmpq_type_struct_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_UB MPQ_TYPE_UB
++#   define PMPI_TYPE_UB PMPQ_TYPE_UB
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_ub__ mpq_type_ub__
++#   define pmpi_type_ub__ pmpq_type_ub__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_ub mpq_type_ub
++#   define pmpi_type_ub pmpq_type_ub
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_ub_ mpq_type_ub_
++#   endif
++#   define pmpi_type_ub_ pmpq_type_ub_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_VECTOR MPQ_TYPE_VECTOR
++#   define PMPI_TYPE_VECTOR PMPQ_TYPE_VECTOR
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_vector__ mpq_type_vector__
++#   define pmpi_type_vector__ pmpq_type_vector__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_vector mpq_type_vector
++#   define pmpi_type_vector pmpq_type_vector
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_vector_ mpq_type_vector_
++#   endif
++#   define pmpi_type_vector_ pmpq_type_vector_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GET_ELEMENTS MPQ_GET_ELEMENTS
++#   define PMPI_GET_ELEMENTS PMPQ_GET_ELEMENTS
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_get_elements__ mpq_get_elements__
++#   define pmpi_get_elements__ pmpq_get_elements__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_get_elements mpq_get_elements
++#   define pmpi_get_elements pmpq_get_elements
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_get_elements_ mpq_get_elements_
++#   endif
++#   define pmpi_get_elements_ pmpq_get_elements_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_PACK_SIZE MPQ_PACK_SIZE
++#   define PMPI_PACK_SIZE PMPQ_PACK_SIZE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_pack_size__ mpq_pack_size__
++#   define pmpi_pack_size__ pmpq_pack_size__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_pack_size mpq_pack_size
++#   define pmpi_pack_size pmpq_pack_size
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_pack_size_ mpq_pack_size_
++#   endif
++#   define pmpi_pack_size_ pmpq_pack_size_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_PACK MPQ_PACK
++#   define PMPI_PACK PMPQ_PACK
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_pack__ mpq_pack__
++#   define pmpi_pack__ pmpq_pack__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_pack mpq_pack
++#   define pmpi_pack pmpq_pack
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_pack_ mpq_pack_
++#   endif
++#   define pmpi_pack_ pmpq_pack_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_UNPACK MPQ_UNPACK
++#   define PMPI_UNPACK PMPQ_UNPACK
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_unpack__ mpq_unpack__
++#   define pmpi_unpack__ pmpq_unpack__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_unpack mpq_unpack
++#   define pmpi_unpack pmpq_unpack
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_unpack_ mpq_unpack_
++#   endif
++#   define pmpi_unpack_ pmpq_unpack_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_INITIALIZED MPQ_INITIALIZED
++#   define PMPI_INITIALIZED PMPQ_INITIALIZED
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_initialized__ mpq_initialized__
++#   define pmpi_initialized__ pmpq_initialized__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_initialized mpq_initialized
++#   define pmpi_initialized pmpq_initialized
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_initialized_ mpq_initialized_
++#   endif
++#   define pmpi_initialized_ pmpq_initialized_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ABORT MPQ_ABORT
++#   define PMPI_ABORT PMPQ_ABORT
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_abort__ mpq_abort__
++#   define pmpi_abort__ pmpq_abort__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_abort mpq_abort
++#   define pmpi_abort pmpq_abort
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_abort_ mpq_abort_
++#   endif
++#   define pmpi_abort_ pmpq_abort_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_INIT MPQ_INIT
++#   define PMPI_INIT PMPQ_INIT
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_init__ mpq_init__
++#   define pmpi_init__ pmpq_init__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_init mpq_init
++#   define pmpi_init pmpq_init
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_init_ mpq_init_
++#   endif
++#   define pmpi_init_ pmpq_init_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_FINALIZE MPQ_FINALIZE
++#   define PMPI_FINALIZE PMPQ_FINALIZE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_finalize__ mpq_finalize__
++#   define pmpi_finalize__ pmpq_finalize__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_finalize mpq_finalize
++#   define pmpi_finalize pmpq_finalize
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_finalize_ mpq_finalize_
++#   endif
++#   define pmpi_finalize_ pmpq_finalize_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ERROR_STRING MPQ_ERROR_STRING
++#   define PMPI_ERROR_STRING PMPQ_ERROR_STRING
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_error_string__ mpq_error_string__
++#   define pmpi_error_string__ pmpq_error_string__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_error_string mpq_error_string
++#   define pmpi_error_string pmpq_error_string
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_error_string_ mpq_error_string_
++#   endif
++#   define pmpi_error_string_ pmpq_error_string_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GET_PROCESSOR_NAME MPQ_GET_PROCESSOR_NAME
++#   define PMPI_GET_PROCESSOR_NAME PMPQ_GET_PROCESSOR_NAME
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_get_processor_name__ mpq_get_processor_name__
++#   define pmpi_get_processor_name__ pmpq_get_processor_name__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_get_processor_name mpq_get_processor_name
++#   define pmpi_get_processor_name pmpq_get_processor_name
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_get_processor_name_ mpq_get_processor_name_
++#   endif
++#   define pmpi_get_processor_name_ pmpq_get_processor_name_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ERRHANDLER_CREATE MPQ_ERRHANDLER_CREATE
++#   define PMPI_ERRHANDLER_CREATE PMPQ_ERRHANDLER_CREATE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_errhandler_create__ mpq_errhandler_create__
++#   define pmpi_errhandler_create__ pmpq_errhandler_create__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_errhandler_create mpq_errhandler_create
++#   define pmpi_errhandler_create pmpq_errhandler_create
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_errhandler_create_ mpq_errhandler_create_
++#   endif
++#   define pmpi_errhandler_create_ pmpq_errhandler_create_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ERRHANDLER_SET MPQ_ERRHANDLER_SET
++#   define PMPI_ERRHANDLER_SET PMPQ_ERRHANDLER_SET
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_errhandler_set__ mpq_errhandler_set__
++#   define pmpi_errhandler_set__ pmpq_errhandler_set__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_errhandler_set mpq_errhandler_set
++#   define pmpi_errhandler_set pmpq_errhandler_set
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_errhandler_set_ mpq_errhandler_set_
++#   endif
++#   define pmpi_errhandler_set_ pmpq_errhandler_set_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ERRHANDLER_GET MPQ_ERRHANDLER_GET
++#   define PMPI_ERRHANDLER_GET PMPQ_ERRHANDLER_GET
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_errhandler_get__ mpq_errhandler_get__
++#   define pmpi_errhandler_get__ pmpq_errhandler_get__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_errhandler_get mpq_errhandler_get
++#   define pmpi_errhandler_get pmpq_errhandler_get
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_errhandler_get_ mpq_errhandler_get_
++#   endif
++#   define pmpi_errhandler_get_ pmpq_errhandler_get_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ERRHANDLER_FREE MPQ_ERRHANDLER_FREE
++#   define PMPI_ERRHANDLER_FREE PMPQ_ERRHANDLER_FREE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_errhandler_free__ mpq_errhandler_free__
++#   define pmpi_errhandler_free__ pmpq_errhandler_free__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_errhandler_free mpq_errhandler_free
++#   define pmpi_errhandler_free pmpq_errhandler_free
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_errhandler_free_ mpq_errhandler_free_
++#   endif
++#   define pmpi_errhandler_free_ pmpq_errhandler_free_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ERROR_CLASS MPQ_ERROR_CLASS
++#   define PMPI_ERROR_CLASS PMPQ_ERROR_CLASS
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_error_class__ mpq_error_class__
++#   define pmpi_error_class__ pmpq_error_class__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_error_class mpq_error_class
++#   define pmpi_error_class pmpq_error_class
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_error_class_ mpq_error_class_
++#   endif
++#   define pmpi_error_class_ pmpq_error_class_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_WTIME MPQ_WTIME
++#   define PMPI_WTIME PMPQ_WTIME
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_wtime__ mpq_wtime__
++#   define pmpi_wtime__ pmpq_wtime__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_wtime mpq_wtime
++#   define pmpi_wtime pmpq_wtime
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_wtime_ mpq_wtime_
++#   endif
++#   define pmpi_wtime_ pmpq_wtime_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_WTICK MPQ_WTICK
++#   define PMPI_WTICK PMPQ_WTICK
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_wtick__ mpq_wtick__
++#   define pmpi_wtick__ pmpq_wtick__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_wtick mpq_wtick
++#   define pmpi_wtick pmpq_wtick
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_wtick_ mpq_wtick_
++#   endif
++#   define pmpi_wtick_ pmpq_wtick_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GET_VERSION MPQ_GET_VERSION
++#   define PMPI_GET_VERSION PMPQ_GET_VERSION
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_get_version__ mpq_get_version__
++#   define pmpi_get_version__ pmpq_get_version__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_get_version mpq_get_version
++#   define pmpi_get_version pmpq_get_version
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_get_version_ mpq_get_version_
++#   endif
++#   define pmpi_get_version_ pmpq_get_version_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_KEYVAL_FREE MPQ_KEYVAL_FREE
++#   define PMPI_KEYVAL_FREE PMPQ_KEYVAL_FREE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_keyval_free__ mpq_keyval_free__
++#   define pmpi_keyval_free__ pmpq_keyval_free__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_keyval_free mpq_keyval_free
++#   define pmpi_keyval_free pmpq_keyval_free
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_keyval_free_ mpq_keyval_free_
++#   endif
++#   define pmpi_keyval_free_ pmpq_keyval_free_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_KEYVAL_CREATE MPQ_KEYVAL_CREATE
++#   define PMPI_KEYVAL_CREATE PMPQ_KEYVAL_CREATE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_keyval_create__ mpq_keyval_create__
++#   define pmpi_keyval_create__ pmpq_keyval_create__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_keyval_create mpq_keyval_create
++#   define pmpi_keyval_create pmpq_keyval_create
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_keyval_create_ mpq_keyval_create_
++#   endif
++#   define pmpi_keyval_create_ pmpq_keyval_create_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ATTR_GET MPQ_ATTR_GET
++#   define PMPI_ATTR_GET PMPQ_ATTR_GET
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_attr_get__ mpq_attr_get__
++#   define pmpi_attr_get__ pmpq_attr_get__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_attr_get mpq_attr_get
++#   define pmpi_attr_get pmpq_attr_get
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_attr_get_ mpq_attr_get_
++#   endif
++#   define pmpi_attr_get_ pmpq_attr_get_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ATTR_DELETE MPQ_ATTR_DELETE
++#   define PMPI_ATTR_DELETE PMPQ_ATTR_DELETE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_attr_delete__ mpq_attr_delete__
++#   define pmpi_attr_delete__ pmpq_attr_delete__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_attr_delete mpq_attr_delete
++#   define pmpi_attr_delete pmpq_attr_delete
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_attr_delete_ mpq_attr_delete_
++#   endif
++#   define pmpi_attr_delete_ pmpq_attr_delete_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ATTR_PUT MPQ_ATTR_PUT
++#   define PMPI_ATTR_PUT PMPQ_ATTR_PUT
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_attr_put__ mpq_attr_put__
++#   define pmpi_attr_put__ pmpq_attr_put__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_attr_put mpq_attr_put
++#   define pmpi_attr_put pmpq_attr_put
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_attr_put_ mpq_attr_put_
++#   endif
++#   define pmpi_attr_put_ pmpq_attr_put_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GROUP_EXCL MPQ_GROUP_EXCL
++#   define PMPI_GROUP_EXCL PMPQ_GROUP_EXCL
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_group_excl__ mpq_group_excl__
++#   define pmpi_group_excl__ pmpq_group_excl__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_group_excl mpq_group_excl
++#   define pmpi_group_excl pmpq_group_excl
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_group_excl_ mpq_group_excl_
++#   endif
++#   define pmpi_group_excl_ pmpq_group_excl_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GROUP_DIFFERENCE MPQ_GROUP_DIFFERENCE
++#   define PMPI_GROUP_DIFFERENCE PMPQ_GROUP_DIFFERENCE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_group_difference__ mpq_group_difference__
++#   define pmpi_group_difference__ pmpq_group_difference__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_group_difference mpq_group_difference
++#   define pmpi_group_difference pmpq_group_difference
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_group_difference_ mpq_group_difference_
++#   endif
++#   define pmpi_group_difference_ pmpq_group_difference_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GROUP_FREE MPQ_GROUP_FREE
++#   define PMPI_GROUP_FREE PMPQ_GROUP_FREE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_group_free__ mpq_group_free__
++#   define pmpi_group_free__ pmpq_group_free__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_group_free mpq_group_free
++#   define pmpi_group_free pmpq_group_free
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_group_free_ mpq_group_free_
++#   endif
++#   define pmpi_group_free_ pmpq_group_free_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GROUP_INCL MPQ_GROUP_INCL
++#   define PMPI_GROUP_INCL PMPQ_GROUP_INCL
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_group_incl__ mpq_group_incl__
++#   define pmpi_group_incl__ pmpq_group_incl__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_group_incl mpq_group_incl
++#   define pmpi_group_incl pmpq_group_incl
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_group_incl_ mpq_group_incl_
++#   endif
++#   define pmpi_group_incl_ pmpq_group_incl_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GROUP_INTERSECTION MPQ_GROUP_INTERSECTION
++#   define PMPI_GROUP_INTERSECTION PMPQ_GROUP_INTERSECTION
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_group_intersection__ mpq_group_intersection__
++#   define pmpi_group_intersection__ pmpq_group_intersection__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_group_intersection mpq_group_intersection
++#   define pmpi_group_intersection pmpq_group_intersection
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_group_intersection_ mpq_group_intersection_
++#   endif
++#   define pmpi_group_intersection_ pmpq_group_intersection_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GROUP_RANK MPQ_GROUP_RANK
++#   define PMPI_GROUP_RANK PMPQ_GROUP_RANK
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_group_rank__ mpq_group_rank__
++#   define pmpi_group_rank__ pmpq_group_rank__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_group_rank mpq_group_rank
++#   define pmpi_group_rank pmpq_group_rank
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_group_rank_ mpq_group_rank_
++#   endif
++#   define pmpi_group_rank_ pmpq_group_rank_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GROUP_SIZE MPQ_GROUP_SIZE
++#   define PMPI_GROUP_SIZE PMPQ_GROUP_SIZE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_group_size__ mpq_group_size__
++#   define pmpi_group_size__ pmpq_group_size__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_group_size mpq_group_size
++#   define pmpi_group_size pmpq_group_size
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_group_size_ mpq_group_size_
++#   endif
++#   define pmpi_group_size_ pmpq_group_size_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GROUP_UNION MPQ_GROUP_UNION
++#   define PMPI_GROUP_UNION PMPQ_GROUP_UNION
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_group_union__ mpq_group_union__
++#   define pmpi_group_union__ pmpq_group_union__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_group_union mpq_group_union
++#   define pmpi_group_union pmpq_group_union
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_group_union_ mpq_group_union_
++#   endif
++#   define pmpi_group_union_ pmpq_group_union_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GROUP_COMPARE MPQ_GROUP_COMPARE
++#   define PMPI_GROUP_COMPARE PMPQ_GROUP_COMPARE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_group_compare__ mpq_group_compare__
++#   define pmpi_group_compare__ pmpq_group_compare__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_group_compare mpq_group_compare
++#   define pmpi_group_compare pmpq_group_compare
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_group_compare_ mpq_group_compare_
++#   endif
++#   define pmpi_group_compare_ pmpq_group_compare_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_COMM_DUP MPQ_COMM_DUP
++#   define PMPI_COMM_DUP PMPQ_COMM_DUP
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_comm_dup__ mpq_comm_dup__
++#   define pmpi_comm_dup__ pmpq_comm_dup__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_comm_dup mpq_comm_dup
++#   define pmpi_comm_dup pmpq_comm_dup
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_comm_dup_ mpq_comm_dup_
++#   endif
++#   define pmpi_comm_dup_ pmpq_comm_dup_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_COMM_FREE MPQ_COMM_FREE
++#   define PMPI_COMM_FREE PMPQ_COMM_FREE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_comm_free__ mpq_comm_free__
++#   define pmpi_comm_free__ pmpq_comm_free__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_comm_free mpq_comm_free
++#   define pmpi_comm_free pmpq_comm_free
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_comm_free_ mpq_comm_free_
++#   endif
++#   define pmpi_comm_free_ pmpq_comm_free_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_COMM_GROUP MPQ_COMM_GROUP
++#   define PMPI_COMM_GROUP PMPQ_COMM_GROUP
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_comm_group__ mpq_comm_group__
++#   define pmpi_comm_group__ pmpq_comm_group__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_comm_group mpq_comm_group
++#   define pmpi_comm_group pmpq_comm_group
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_comm_group_ mpq_comm_group_
++#   endif
++#   define pmpi_comm_group_ pmpq_comm_group_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_COMM_CREATE MPQ_COMM_CREATE
++#   define PMPI_COMM_CREATE PMPQ_COMM_CREATE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_comm_create__ mpq_comm_create__
++#   define pmpi_comm_create__ pmpq_comm_create__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_comm_create mpq_comm_create
++#   define pmpi_comm_create pmpq_comm_create
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_comm_create_ mpq_comm_create_
++#   endif
++#   define pmpi_comm_create_ pmpq_comm_create_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_COMM_SET_NAME MPQ_COMM_SET_NAME
++#   define PMPI_COMM_SET_NAME PMPQ_COMM_SET_NAME
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_comm_set_name__ mpq_comm_set_name__
++#   define pmpi_comm_set_name__ pmpq_comm_set_name__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_comm_set_name mpq_comm_set_name
++#   define pmpi_comm_set_name pmpq_comm_set_name
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_comm_set_name_ mpq_comm_set_name_
++#   endif
++#   define pmpi_comm_set_name_ pmpq_comm_set_name_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_COMM_GET_NAME MPQ_COMM_GET_NAME
++#   define PMPI_COMM_GET_NAME PMPQ_COMM_GET_NAME
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_comm_get_name__ mpq_comm_get_name__
++#   define pmpi_comm_get_name__ pmpq_comm_get_name__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_comm_get_name mpq_comm_get_name
++#   define pmpi_comm_get_name pmpq_comm_get_name
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_comm_get_name_ mpq_comm_get_name_
++#   endif
++#   define pmpi_comm_get_name_ pmpq_comm_get_name_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_COMM_SIZE MPQ_COMM_SIZE
++#   define PMPI_COMM_SIZE PMPQ_COMM_SIZE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_comm_size__ mpq_comm_size__
++#   define pmpi_comm_size__ pmpq_comm_size__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_comm_size mpq_comm_size
++#   define pmpi_comm_size pmpq_comm_size
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_comm_size_ mpq_comm_size_
++#   endif
++#   define pmpi_comm_size_ pmpq_comm_size_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_COMM_SPLIT MPQ_COMM_SPLIT
++#   define PMPI_COMM_SPLIT PMPQ_COMM_SPLIT
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_comm_split__ mpq_comm_split__
++#   define pmpi_comm_split__ pmpq_comm_split__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_comm_split mpq_comm_split
++#   define pmpi_comm_split pmpq_comm_split
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_comm_split_ mpq_comm_split_
++#   endif
++#   define pmpi_comm_split_ pmpq_comm_split_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GROUP_TRANSLATE_RANKS MPQ_GROUP_TRANSLATE_RANKS
++#   define PMPI_GROUP_TRANSLATE_RANKS PMPQ_GROUP_TRANSLATE_RANKS
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_group_translate_ranks__ mpq_group_translate_ranks__
++#   define pmpi_group_translate_ranks__ pmpq_group_translate_ranks__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_group_translate_ranks mpq_group_translate_ranks
++#   define pmpi_group_translate_ranks pmpq_group_translate_ranks
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_group_translate_ranks_ mpq_group_translate_ranks_
++#   endif
++#   define pmpi_group_translate_ranks_ pmpq_group_translate_ranks_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_COMM_TEST_INTER MPQ_COMM_TEST_INTER
++#   define PMPI_COMM_TEST_INTER PMPQ_COMM_TEST_INTER
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_comm_test_inter__ mpq_comm_test_inter__
++#   define pmpi_comm_test_inter__ pmpq_comm_test_inter__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_comm_test_inter mpq_comm_test_inter
++#   define pmpi_comm_test_inter pmpq_comm_test_inter
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_comm_test_inter_ mpq_comm_test_inter_
++#   endif
++#   define pmpi_comm_test_inter_ pmpq_comm_test_inter_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_COMM_RANK MPQ_COMM_RANK
++#   define PMPI_COMM_RANK PMPQ_COMM_RANK
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_comm_rank__ mpq_comm_rank__
++#   define pmpi_comm_rank__ pmpq_comm_rank__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_comm_rank mpq_comm_rank
++#   define pmpi_comm_rank pmpq_comm_rank
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_comm_rank_ mpq_comm_rank_
++#   endif
++#   define pmpi_comm_rank_ pmpq_comm_rank_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_COMM_COMPARE MPQ_COMM_COMPARE
++#   define PMPI_COMM_COMPARE PMPQ_COMM_COMPARE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_comm_compare__ mpq_comm_compare__
++#   define pmpi_comm_compare__ pmpq_comm_compare__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_comm_compare mpq_comm_compare
++#   define pmpi_comm_compare pmpq_comm_compare
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_comm_compare_ mpq_comm_compare_
++#   endif
++#   define pmpi_comm_compare_ pmpq_comm_compare_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_COMM_REMOTE_SIZE MPQ_COMM_REMOTE_SIZE
++#   define PMPI_COMM_REMOTE_SIZE PMPQ_COMM_REMOTE_SIZE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_comm_remote_size__ mpq_comm_remote_size__
++#   define pmpi_comm_remote_size__ pmpq_comm_remote_size__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_comm_remote_size mpq_comm_remote_size
++#   define pmpi_comm_remote_size pmpq_comm_remote_size
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_comm_remote_size_ mpq_comm_remote_size_
++#   endif
++#   define pmpi_comm_remote_size_ pmpq_comm_remote_size_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_COMM_REMOTE_GROUP MPQ_COMM_REMOTE_GROUP
++#   define PMPI_COMM_REMOTE_GROUP PMPQ_COMM_REMOTE_GROUP
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_comm_remote_group__ mpq_comm_remote_group__
++#   define pmpi_comm_remote_group__ pmpq_comm_remote_group__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_comm_remote_group mpq_comm_remote_group
++#   define pmpi_comm_remote_group pmpq_comm_remote_group
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_comm_remote_group_ mpq_comm_remote_group_
++#   endif
++#   define pmpi_comm_remote_group_ pmpq_comm_remote_group_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_INTERCOMM_CREATE MPQ_INTERCOMM_CREATE
++#   define PMPI_INTERCOMM_CREATE PMPQ_INTERCOMM_CREATE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_intercomm_create__ mpq_intercomm_create__
++#   define pmpi_intercomm_create__ pmpq_intercomm_create__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_intercomm_create mpq_intercomm_create
++#   define pmpi_intercomm_create pmpq_intercomm_create
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_intercomm_create_ mpq_intercomm_create_
++#   endif
++#   define pmpi_intercomm_create_ pmpq_intercomm_create_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_INTERCOMM_MERGE MPQ_INTERCOMM_MERGE
++#   define PMPI_INTERCOMM_MERGE PMPQ_INTERCOMM_MERGE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_intercomm_merge__ mpq_intercomm_merge__
++#   define pmpi_intercomm_merge__ pmpq_intercomm_merge__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_intercomm_merge mpq_intercomm_merge
++#   define pmpi_intercomm_merge pmpq_intercomm_merge
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_intercomm_merge_ mpq_intercomm_merge_
++#   endif
++#   define pmpi_intercomm_merge_ pmpq_intercomm_merge_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_NULL_COPY_FN MPQ_NULL_COPY_FN
++#   define PMPI_NULL_COPY_FN PMPQ_NULL_COPY_FN
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_null_copy_fn__ mpq_null_copy_fn__
++#   define pmpi_null_copy_fn__ pmpq_null_copy_fn__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_null_copy_fn mpq_null_copy_fn
++#   define pmpi_null_copy_fn pmpq_null_copy_fn
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_null_copy_fn_ mpq_null_copy_fn_
++#   endif
++#   define pmpi_null_copy_fn_ pmpq_null_copy_fn_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_NULL_DELETE_FN MPQ_NULL_DELETE_FN
++#   define PMPI_NULL_DELETE_FN PMPQ_NULL_DELETE_FN
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_null_delete_fn__ mpq_null_delete_fn__
++#   define pmpi_null_delete_fn__ pmpq_null_delete_fn__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_null_delete_fn mpq_null_delete_fn
++#   define pmpi_null_delete_fn pmpq_null_delete_fn
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_null_delete_fn_ mpq_null_delete_fn_
++#   endif
++#   define pmpi_null_delete_fn_ pmpq_null_delete_fn_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_DUP_FN MPQ_DUP_FN
++#   define PMPI_DUP_FN PMPQ_DUP_FN
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_dup_fn__ mpq_dup_fn__
++#   define pmpi_dup_fn__ pmpq_dup_fn__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_dup_fn mpq_dup_fn
++#   define pmpi_dup_fn pmpq_dup_fn
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_dup_fn_ mpq_dup_fn_
++#   endif
++#   define pmpi_dup_fn_ pmpq_dup_fn_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_BARRIER MPQ_BARRIER
++#   define PMPI_BARRIER PMPQ_BARRIER
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_barrier__ mpq_barrier__
++#   define pmpi_barrier__ pmpq_barrier__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_barrier mpq_barrier
++#   define pmpi_barrier pmpq_barrier
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_barrier_ mpq_barrier_
++#   endif
++#   define pmpi_barrier_ pmpq_barrier_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_BCAST MPQ_BCAST
++#   define PMPI_BCAST PMPQ_BCAST
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_bcast__ mpq_bcast__
++#   define pmpi_bcast__ pmpq_bcast__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_bcast mpq_bcast
++#   define pmpi_bcast pmpq_bcast
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_bcast_ mpq_bcast_
++#   endif
++#   define pmpi_bcast_ pmpq_bcast_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GATHER MPQ_GATHER
++#   define PMPI_GATHER PMPQ_GATHER
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_gather__ mpq_gather__
++#   define pmpi_gather__ pmpq_gather__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_gather mpq_gather
++#   define pmpi_gather pmpq_gather
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_gather_ mpq_gather_
++#   endif
++#   define pmpi_gather_ pmpq_gather_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GATHERV MPQ_GATHERV
++#   define PMPI_GATHERV PMPQ_GATHERV
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_gatherv__ mpq_gatherv__
++#   define pmpi_gatherv__ pmpq_gatherv__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_gatherv mpq_gatherv
++#   define pmpi_gatherv pmpq_gatherv
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_gatherv_ mpq_gatherv_
++#   endif
++#   define pmpi_gatherv_ pmpq_gatherv_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_SCATTER MPQ_SCATTER
++#   define PMPI_SCATTER PMPQ_SCATTER
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_scatter__ mpq_scatter__
++#   define pmpi_scatter__ pmpq_scatter__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_scatter mpq_scatter
++#   define pmpi_scatter pmpq_scatter
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_scatter_ mpq_scatter_
++#   endif
++#   define pmpi_scatter_ pmpq_scatter_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_SCATTERV MPQ_SCATTERV
++#   define PMPI_SCATTERV PMPQ_SCATTERV
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_scatterv__ mpq_scatterv__
++#   define pmpi_scatterv__ pmpq_scatterv__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_scatterv mpq_scatterv
++#   define pmpi_scatterv pmpq_scatterv
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_scatterv_ mpq_scatterv_
++#   endif
++#   define pmpi_scatterv_ pmpq_scatterv_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ALLGATHER MPQ_ALLGATHER
++#   define PMPI_ALLGATHER PMPQ_ALLGATHER
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_allgather__ mpq_allgather__
++#   define pmpi_allgather__ pmpq_allgather__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_allgather mpq_allgather
++#   define pmpi_allgather pmpq_allgather
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_allgather_ mpq_allgather_
++#   endif
++#   define pmpi_allgather_ pmpq_allgather_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ALLGATHERV MPQ_ALLGATHERV
++#   define PMPI_ALLGATHERV PMPQ_ALLGATHERV
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_allgatherv__ mpq_allgatherv__
++#   define pmpi_allgatherv__ pmpq_allgatherv__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_allgatherv mpq_allgatherv
++#   define pmpi_allgatherv pmpq_allgatherv
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_allgatherv_ mpq_allgatherv_
++#   endif
++#   define pmpi_allgatherv_ pmpq_allgatherv_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ALLTOALL MPQ_ALLTOALL
++#   define PMPI_ALLTOALL PMPQ_ALLTOALL
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_alltoall__ mpq_alltoall__
++#   define pmpi_alltoall__ pmpq_alltoall__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_alltoall mpq_alltoall
++#   define pmpi_alltoall pmpq_alltoall
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_alltoall_ mpq_alltoall_
++#   endif
++#   define pmpi_alltoall_ pmpq_alltoall_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ALLTOALLV MPQ_ALLTOALLV
++#   define PMPI_ALLTOALLV PMPQ_ALLTOALLV
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_alltoallv__ mpq_alltoallv__
++#   define pmpi_alltoallv__ pmpq_alltoallv__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_alltoallv mpq_alltoallv
++#   define pmpi_alltoallv pmpq_alltoallv
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_alltoallv_ mpq_alltoallv_
++#   endif
++#   define pmpi_alltoallv_ pmpq_alltoallv_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_REDUCE MPQ_REDUCE
++#   define PMPI_REDUCE PMPQ_REDUCE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_reduce__ mpq_reduce__
++#   define pmpi_reduce__ pmpq_reduce__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_reduce mpq_reduce
++#   define pmpi_reduce pmpq_reduce
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_reduce_ mpq_reduce_
++#   endif
++#   define pmpi_reduce_ pmpq_reduce_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_ALLREDUCE MPQ_ALLREDUCE
++#   define PMPI_ALLREDUCE PMPQ_ALLREDUCE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_allreduce__ mpq_allreduce__
++#   define pmpi_allreduce__ pmpq_allreduce__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_allreduce mpq_allreduce
++#   define pmpi_allreduce pmpq_allreduce
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_allreduce_ mpq_allreduce_
++#   endif
++#   define pmpi_allreduce_ pmpq_allreduce_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_REDUCE_SCATTER MPQ_REDUCE_SCATTER
++#   define PMPI_REDUCE_SCATTER PMPQ_REDUCE_SCATTER
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_reduce_scatter__ mpq_reduce_scatter__
++#   define pmpi_reduce_scatter__ pmpq_reduce_scatter__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_reduce_scatter mpq_reduce_scatter
++#   define pmpi_reduce_scatter pmpq_reduce_scatter
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_reduce_scatter_ mpq_reduce_scatter_
++#   endif
++#   define pmpi_reduce_scatter_ pmpq_reduce_scatter_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_SCAN MPQ_SCAN
++#   define PMPI_SCAN PMPQ_SCAN
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_scan__ mpq_scan__
++#   define pmpi_scan__ pmpq_scan__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_scan mpq_scan
++#   define pmpi_scan pmpq_scan
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_scan_ mpq_scan_
++#   endif
++#   define pmpi_scan_ pmpq_scan_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_OP_CREATE MPQ_OP_CREATE
++#   define PMPI_OP_CREATE PMPQ_OP_CREATE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_op_create__ mpq_op_create__
++#   define pmpi_op_create__ pmpq_op_create__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_op_create mpq_op_create
++#   define pmpi_op_create pmpq_op_create
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_op_create_ mpq_op_create_
++#   endif
++#   define pmpi_op_create_ pmpq_op_create_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_OP_FREE MPQ_OP_FREE
++#   define PMPI_OP_FREE PMPQ_OP_FREE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_op_free__ mpq_op_free__
++#   define pmpi_op_free__ pmpq_op_free__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_op_free mpq_op_free
++#   define pmpi_op_free pmpq_op_free
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_op_free_ mpq_op_free_
++#   endif
++#   define pmpi_op_free_ pmpq_op_free_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TOPO_TEST MPQ_TOPO_TEST
++#   define PMPI_TOPO_TEST PMPQ_TOPO_TEST
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_topo_test__ mpq_topo_test__
++#   define pmpi_topo_test__ pmpq_topo_test__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_topo_test mpq_topo_test
++#   define pmpi_topo_test pmpq_topo_test
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_topo_test_ mpq_topo_test_
++#   endif
++#   define pmpi_topo_test_ pmpq_topo_test_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GRAPHDIMS_GET MPQ_GRAPHDIMS_GET
++#   define PMPI_GRAPHDIMS_GET PMPQ_GRAPHDIMS_GET
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_graphdims_get__ mpq_graphdims_get__
++#   define pmpi_graphdims_get__ pmpq_graphdims_get__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_graphdims_get mpq_graphdims_get
++#   define pmpi_graphdims_get pmpq_graphdims_get
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_graphdims_get_ mpq_graphdims_get_
++#   endif
++#   define pmpi_graphdims_get_ pmpq_graphdims_get_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GRAPH_GET MPQ_GRAPH_GET
++#   define PMPI_GRAPH_GET PMPQ_GRAPH_GET
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_graph_get__ mpq_graph_get__
++#   define pmpi_graph_get__ pmpq_graph_get__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_graph_get mpq_graph_get
++#   define pmpi_graph_get pmpq_graph_get
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_graph_get_ mpq_graph_get_
++#   endif
++#   define pmpi_graph_get_ pmpq_graph_get_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_CARTDIM_GET MPQ_CARTDIM_GET
++#   define PMPI_CARTDIM_GET PMPQ_CARTDIM_GET
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_cartdim_get__ mpq_cartdim_get__
++#   define pmpi_cartdim_get__ pmpq_cartdim_get__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_cartdim_get mpq_cartdim_get
++#   define pmpi_cartdim_get pmpq_cartdim_get
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_cartdim_get_ mpq_cartdim_get_
++#   endif
++#   define pmpi_cartdim_get_ pmpq_cartdim_get_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_CART_GET MPQ_CART_GET
++#   define PMPI_CART_GET PMPQ_CART_GET
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_cart_get__ mpq_cart_get__
++#   define pmpi_cart_get__ pmpq_cart_get__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_cart_get mpq_cart_get
++#   define pmpi_cart_get pmpq_cart_get
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_cart_get_ mpq_cart_get_
++#   endif
++#   define pmpi_cart_get_ pmpq_cart_get_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_DIMS_CREATE MPQ_DIMS_CREATE
++#   define PMPI_DIMS_CREATE PMPQ_DIMS_CREATE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_dims_create__ mpq_dims_create__
++#   define pmpi_dims_create__ pmpq_dims_create__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_dims_create mpq_dims_create
++#   define pmpi_dims_create pmpq_dims_create
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_dims_create_ mpq_dims_create_
++#   endif
++#   define pmpi_dims_create_ pmpq_dims_create_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_CART_MAP MPQ_CART_MAP
++#   define PMPI_CART_MAP PMPQ_CART_MAP
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_cart_map__ mpq_cart_map__
++#   define pmpi_cart_map__ pmpq_cart_map__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_cart_map mpq_cart_map
++#   define pmpi_cart_map pmpq_cart_map
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_cart_map_ mpq_cart_map_
++#   endif
++#   define pmpi_cart_map_ pmpq_cart_map_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GRAPH_MAP MPQ_GRAPH_MAP
++#   define PMPI_GRAPH_MAP PMPQ_GRAPH_MAP
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_graph_map__ mpq_graph_map__
++#   define pmpi_graph_map__ pmpq_graph_map__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_graph_map mpq_graph_map
++#   define pmpi_graph_map pmpq_graph_map
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_graph_map_ mpq_graph_map_
++#   endif
++#   define pmpi_graph_map_ pmpq_graph_map_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_CART_CREATE MPQ_CART_CREATE
++#   define PMPI_CART_CREATE PMPQ_CART_CREATE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_cart_create__ mpq_cart_create__
++#   define pmpi_cart_create__ pmpq_cart_create__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_cart_create mpq_cart_create
++#   define pmpi_cart_create pmpq_cart_create
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_cart_create_ mpq_cart_create_
++#   endif
++#   define pmpi_cart_create_ pmpq_cart_create_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GRAPH_CREATE MPQ_GRAPH_CREATE
++#   define PMPI_GRAPH_CREATE PMPQ_GRAPH_CREATE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_graph_create__ mpq_graph_create__
++#   define pmpi_graph_create__ pmpq_graph_create__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_graph_create mpq_graph_create
++#   define pmpi_graph_create pmpq_graph_create
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_graph_create_ mpq_graph_create_
++#   endif
++#   define pmpi_graph_create_ pmpq_graph_create_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_CART_RANK MPQ_CART_RANK
++#   define PMPI_CART_RANK PMPQ_CART_RANK
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_cart_rank__ mpq_cart_rank__
++#   define pmpi_cart_rank__ pmpq_cart_rank__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_cart_rank mpq_cart_rank
++#   define pmpi_cart_rank pmpq_cart_rank
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_cart_rank_ mpq_cart_rank_
++#   endif
++#   define pmpi_cart_rank_ pmpq_cart_rank_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_CART_COORDS MPQ_CART_COORDS
++#   define PMPI_CART_COORDS PMPQ_CART_COORDS
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_cart_coords__ mpq_cart_coords__
++#   define pmpi_cart_coords__ pmpq_cart_coords__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_cart_coords mpq_cart_coords
++#   define pmpi_cart_coords pmpq_cart_coords
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_cart_coords_ mpq_cart_coords_
++#   endif
++#   define pmpi_cart_coords_ pmpq_cart_coords_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GRAPH_NEIGHBORS_COUNT MPQ_GRAPH_NEIGHBORS_COUNT
++#   define PMPI_GRAPH_NEIGHBORS_COUNT PMPQ_GRAPH_NEIGHBORS_COUNT
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_graph_neighbors_count__ mpq_graph_neighbors_count__
++#   define pmpi_graph_neighbors_count__ pmpq_graph_neighbors_count__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_graph_neighbors_count mpq_graph_neighbors_count
++#   define pmpi_graph_neighbors_count pmpq_graph_neighbors_count
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_graph_neighbors_count_ mpq_graph_neighbors_count_
++#   endif
++#   define pmpi_graph_neighbors_count_ pmpq_graph_neighbors_count_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GRAPH_NEIGHBORS MPQ_GRAPH_NEIGHBORS
++#   define PMPI_GRAPH_NEIGHBORS PMPQ_GRAPH_NEIGHBORS
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_graph_neighbors__ mpq_graph_neighbors__
++#   define pmpi_graph_neighbors__ pmpq_graph_neighbors__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_graph_neighbors mpq_graph_neighbors
++#   define pmpi_graph_neighbors pmpq_graph_neighbors
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_graph_neighbors_ mpq_graph_neighbors_
++#   endif
++#   define pmpi_graph_neighbors_ pmpq_graph_neighbors_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_CART_SHIFT MPQ_CART_SHIFT
++#   define PMPI_CART_SHIFT PMPQ_CART_SHIFT
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_cart_shift__ mpq_cart_shift__
++#   define pmpi_cart_shift__ pmpq_cart_shift__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_cart_shift mpq_cart_shift
++#   define pmpi_cart_shift pmpq_cart_shift
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_cart_shift_ mpq_cart_shift_
++#   endif
++#   define pmpi_cart_shift_ pmpq_cart_shift_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_CART_SUB MPQ_CART_SUB
++#   define PMPI_CART_SUB PMPQ_CART_SUB
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_cart_sub__ mpq_cart_sub__
++#   define pmpi_cart_sub__ pmpq_cart_sub__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_cart_sub mpq_cart_sub
++#   define pmpi_cart_sub pmpq_cart_sub
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_cart_sub_ mpq_cart_sub_
++#   endif
++#   define pmpi_cart_sub_ pmpq_cart_sub_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_PCONTROL MPQ_PCONTROL
++#   define PMPI_PCONTROL PMPQ_PCONTROL
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_pcontrol__ mpq_pcontrol__
++#   define pmpi_pcontrol__ pmpq_pcontrol__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_pcontrol mpq_pcontrol
++#   define pmpi_pcontrol pmpq_pcontrol
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_pcontrol_ mpq_pcontrol_
++#   endif
++#   define pmpi_pcontrol_ pmpq_pcontrol_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_FINALIZED MPQ_FINALIZED
++#   define PMPI_FINALIZED PMPQ_FINALIZED
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_finalized__ mpq_finalized__
++#   define pmpi_finalized__ pmpq_finalized__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_finalized mpq_finalized
++#   define pmpi_finalized pmpq_finalized
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_finalized_ mpq_finalized_
++#   endif
++#   define pmpi_finalized_ pmpq_finalized_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_CREATE_INDEXED_BLOCK MPQ_TYPE_CREATE_INDEXED_BLOCK
++#   define PMPI_TYPE_CREATE_INDEXED_BLOCK PMPQ_TYPE_CREATE_INDEXED_BLOCK
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_create_indexed_block__ mpq_type_create_indexed_block__
++#   define pmpi_type_create_indexed_block__ pmpq_type_create_indexed_block__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_create_indexed_block mpq_type_create_indexed_block
++#   define pmpi_type_create_indexed_block pmpq_type_create_indexed_block
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_create_indexed_block_ mpq_type_create_indexed_block_
++#   endif
++#   define pmpi_type_create_indexed_block_ pmpq_type_create_indexed_block_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_CREATE_SUBARRAY MPQ_TYPE_CREATE_SUBARRAY
++#   define PMPI_TYPE_CREATE_SUBARRAY PMPQ_TYPE_CREATE_SUBARRAY
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_create_subarray__ mpq_type_create_subarray__
++#   define pmpi_type_create_subarray__ pmpq_type_create_subarray__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_create_subarray mpq_type_create_subarray
++#   define pmpi_type_create_subarray pmpq_type_create_subarray
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_create_subarray_ mpq_type_create_subarray_
++#   endif
++#   define pmpi_type_create_subarray_ pmpq_type_create_subarray_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_CREATE_DARRAY MPQ_TYPE_CREATE_DARRAY
++#   define PMPI_TYPE_CREATE_DARRAY PMPQ_TYPE_CREATE_DARRAY
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_create_darray__ mpq_type_create_darray__
++#   define pmpi_type_create_darray__ pmpq_type_create_darray__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_create_darray mpq_type_create_darray
++#   define pmpi_type_create_darray pmpq_type_create_darray
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_create_darray_ mpq_type_create_darray_
++#   endif
++#   define pmpi_type_create_darray_ pmpq_type_create_darray_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_INFO_CREATE MPQ_INFO_CREATE
++#   define PMPI_INFO_CREATE PMPQ_INFO_CREATE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_info_create__ mpq_info_create__
++#   define pmpi_info_create__ pmpq_info_create__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_info_create mpq_info_create
++#   define pmpi_info_create pmpq_info_create
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_info_create_ mpq_info_create_
++#   endif
++#   define pmpi_info_create_ pmpq_info_create_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_INFO_DUP MPQ_INFO_DUP
++#   define PMPI_INFO_DUP PMPQ_INFO_DUP
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_info_dup__ mpq_info_dup__
++#   define pmpi_info_dup__ pmpq_info_dup__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_info_dup mpq_info_dup
++#   define pmpi_info_dup pmpq_info_dup
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_info_dup_ mpq_info_dup_
++#   endif
++#   define pmpi_info_dup_ pmpq_info_dup_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_INFO_GET MPQ_INFO_GET
++#   define PMPI_INFO_GET PMPQ_INFO_GET
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_info_get__ mpq_info_get__
++#   define pmpi_info_get__ pmpq_info_get__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_info_get mpq_info_get
++#   define pmpi_info_get pmpq_info_get
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_info_get_ mpq_info_get_
++#   endif
++#   define pmpi_info_get_ pmpq_info_get_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_INFO_GET_NTHKEY MPQ_INFO_GET_NTHKEY
++#   define PMPI_INFO_GET_NTHKEY PMPQ_INFO_GET_NTHKEY
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_info_get_nthkey__ mpq_info_get_nthkey__
++#   define pmpi_info_get_nthkey__ pmpq_info_get_nthkey__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_info_get_nthkey mpq_info_get_nthkey
++#   define pmpi_info_get_nthkey pmpq_info_get_nthkey
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_info_get_nthkey_ mpq_info_get_nthkey_
++#   endif
++#   define pmpi_info_get_nthkey_ pmpq_info_get_nthkey_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_INFO_SET MPQ_INFO_SET
++#   define PMPI_INFO_SET PMPQ_INFO_SET
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_info_set__ mpq_info_set__
++#   define pmpi_info_set__ pmpq_info_set__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_info_set mpq_info_set
++#   define pmpi_info_set pmpq_info_set
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_info_set_ mpq_info_set_
++#   endif
++#   define pmpi_info_set_ pmpq_info_set_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_INFO_DELETE MPQ_INFO_DELETE
++#   define PMPI_INFO_DELETE PMPQ_INFO_DELETE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_info_delete__ mpq_info_delete__
++#   define pmpi_info_delete__ pmpq_info_delete__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_info_delete mpq_info_delete
++#   define pmpi_info_delete pmpq_info_delete
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_info_delete_ mpq_info_delete_
++#   endif
++#   define pmpi_info_delete_ pmpq_info_delete_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_INFO_FREE MPQ_INFO_FREE
++#   define PMPI_INFO_FREE PMPQ_INFO_FREE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_info_free__ mpq_info_free__
++#   define pmpi_info_free__ pmpq_info_free__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_info_free mpq_info_free
++#   define pmpi_info_free pmpq_info_free
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_info_free_ mpq_info_free_
++#   endif
++#   define pmpi_info_free_ pmpq_info_free_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_INFO_GET_NKEYS MPQ_INFO_GET_NKEYS
++#   define PMPI_INFO_GET_NKEYS PMPQ_INFO_GET_NKEYS
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_info_get_nkeys__ mpq_info_get_nkeys__
++#   define pmpi_info_get_nkeys__ pmpq_info_get_nkeys__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_info_get_nkeys mpq_info_get_nkeys
++#   define pmpi_info_get_nkeys pmpq_info_get_nkeys
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_info_get_nkeys_ mpq_info_get_nkeys_
++#   endif
++#   define pmpi_info_get_nkeys_ pmpq_info_get_nkeys_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_INFO_GET_VALUELEN MPQ_INFO_GET_VALUELEN
++#   define PMPI_INFO_GET_VALUELEN PMPQ_INFO_GET_VALUELEN
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_info_get_valuelen__ mpq_info_get_valuelen__
++#   define pmpi_info_get_valuelen__ pmpq_info_get_valuelen__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_info_get_valuelen mpq_info_get_valuelen
++#   define pmpi_info_get_valuelen pmpq_info_get_valuelen
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_info_get_valuelen_ mpq_info_get_valuelen_
++#   endif
++#   define pmpi_info_get_valuelen_ pmpq_info_get_valuelen_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_GET_CONTENTS MPQ_TYPE_GET_CONTENTS
++#   define PMPI_TYPE_GET_CONTENTS PMPQ_TYPE_GET_CONTENTS
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_get_contents__ mpq_type_get_contents__
++#   define pmpi_type_get_contents__ pmpq_type_get_contents__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_get_contents mpq_type_get_contents
++#   define pmpi_type_get_contents pmpq_type_get_contents
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_get_contents_ mpq_type_get_contents_
++#   endif
++#   define pmpi_type_get_contents_ pmpq_type_get_contents_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_TYPE_GET_ENVELOPE MPQ_TYPE_GET_ENVELOPE
++#   define PMPI_TYPE_GET_ENVELOPE PMPQ_TYPE_GET_ENVELOPE
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_type_get_envelope__ mpq_type_get_envelope__
++#   define pmpi_type_get_envelope__ pmpq_type_get_envelope__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_type_get_envelope mpq_type_get_envelope
++#   define pmpi_type_get_envelope pmpq_type_get_envelope
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_type_get_envelope_ mpq_type_get_envelope_
++#   endif
++#   define pmpi_type_get_envelope_ pmpq_type_get_envelope_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GROUP_RANGE_INCL MPQ_GROUP_RANGE_INCL
++#   define PMPI_GROUP_RANGE_INCL PMPQ_GROUP_RANGE_INCL
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_group_range_incl__ mpq_group_range_incl__
++#   define pmpi_group_range_incl__ pmpq_group_range_incl__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_group_range_incl mpq_group_range_incl
++#   define pmpi_group_range_incl pmpq_group_range_incl
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_group_range_incl_ mpq_group_range_incl_
++#   endif
++#   define pmpi_group_range_incl_ pmpq_group_range_incl_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_GROUP_RANGE_EXCL MPQ_GROUP_RANGE_EXCL
++#   define PMPI_GROUP_RANGE_EXCL PMPQ_GROUP_RANGE_EXCL
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_group_range_excl__ mpq_group_range_excl__
++#   define pmpi_group_range_excl__ pmpq_group_range_excl__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_group_range_excl mpq_group_range_excl
++#   define pmpi_group_range_excl pmpq_group_range_excl
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_group_range_excl_ mpq_group_range_excl_
++#   endif
++#   define pmpi_group_range_excl_ pmpq_group_range_excl_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_STATUS_SET_CANCELLED MPQ_STATUS_SET_CANCELLED
++#   define PMPI_STATUS_SET_CANCELLED PMPQ_STATUS_SET_CANCELLED
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_status_set_cancelled__ mpq_status_set_cancelled__
++#   define pmpi_status_set_cancelled__ pmpq_status_set_cancelled__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_status_set_cancelled mpq_status_set_cancelled
++#   define pmpi_status_set_cancelled pmpq_status_set_cancelled
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_status_set_cancelled_ mpq_status_set_cancelled_
++#   endif
++#   define pmpi_status_set_cancelled_ pmpq_status_set_cancelled_
++#endif
++
++#if defined(F77_NAME_UPPER)
++#   define MPI_STATUS_SET_ELEMENTS MPQ_STATUS_SET_ELEMENTS
++#   define PMPI_STATUS_SET_ELEMENTS PMPQ_STATUS_SET_ELEMENTS
++#elif defined(F77_NAME_LOWER_2USCORE)
++#   define mpi_status_set_elements__ mpq_status_set_elements__
++#   define pmpi_status_set_elements__ pmpq_status_set_elements__
++#elif !defined(F77_NAME_LOWER_USCORE)
++#   define mpi_status_set_elements mpq_status_set_elements
++#   define pmpi_status_set_elements pmpq_status_set_elements
++#else
++#   if !defined(MPI_BUILD_PROFILING)
++#       define mpi_status_set_elements_ mpq_status_set_elements_
++#   endif
++#   define pmpi_status_set_elements_ pmpq_status_set_elements_
++#endif
++
++#endif /* !defined(MPID_FORT_H) */
+--- mpich-1.2.7.orig/mpid/util/Makefile.in
++++ mpich-1.2.7/mpid/util/Makefile.in
+@@ -1,5 +1,5 @@
+ #
+-#  $Id: Makefile.in,v 1.5 2004/08/11 15:30:28 gropp Exp $
++#  $Id: Makefile.in,v 1.6 2005/10/17 16:25:13 gropp Exp $
+ #
+ #  (C) 1993,1995 by Argonne National Laboratory and Mississipi State University.
+ #      All rights reserved.  See COPYRIGHT in top-level directory.
+@@ -38,7 +38,7 @@
+ # can speed up the build (ranlibs can take a LONG time).  profile_all 
+ # is the same, but for the profile library
+ default_all: $(MPI_OBJECTS)
+-	$(AR) ../../build/$(ARCH)/$(DEVICE)/lib/lib@MPILIBNAME@.a $?
++	$(AR) cr ../../build/$(ARCH)/$(DEVICE)/lib/lib@MPILIBNAME@.a $?
+ profile_all: 
+ 
+ clean:
+@@ -48,10 +48,10 @@
+ 	$(CC) $(CFLAGS) $(BASEOPT) -c $*.c $(MPI_PROFILE)
+ 
+ ../../build/$(ARCH)/$(DEVICE)/lib/lib@MPILIBNAME@.a: $(MPI_OBJECTS) 
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+ ../$(DEVICE)/libmpid.a: $(MPI_OBJECTS) 
+-	$(AR) $@ $?
++	$(AR) cr $@ $?
+ 	$(RANLIB) $@
+ 
+--- mpich-1.2.7.orig/src/coll/Makefile.in
++++ mpich-1.2.7/src/coll/Makefile.in
+@@ -54,11 +54,11 @@
+ # can speed up the build (ranlibs can take a LONG time).  profile_all 
+ # is the same, but for the profile library
+ default_all: ${MPI_OBJECTS}
+-	${AR} ${libbuild_dir}/lib@MPILIBNAME@.a $?
++	${AR} cr ${libbuild_dir}/lib@MPILIBNAME@.a $?
+ profile_all: ${MPI_OBJECTS}
+-	${AR} ${libbuild_dir}/libp@MPILIBNAME@.a $?
++	${AR} cr ${libbuild_dir}/libp@MPILIBNAME@.a $?
+ default_conly: ${MPI_COBJECTS}
+-	${AR} ${libbuild_dir}/lib@MPILIBNAME@.a $?
++	${AR} cr ${libbuild_dir}/lib@MPILIBNAME@.a $?
+ 	${RANLIB} ${libbuild_dir}/lib@MPILIBNAME@.a
+ 
+ source_names:
+@@ -68,11 +68,11 @@
+ 	${CC} ${DEFS} ${INCLUDES} ${CFLAGS} ${OPTFLAGSC} ${OPTFLAGS} -c $<
+ 
+ ${libbuild_dir}/lib@MPILIBNAME@.a: ${MPI_OBJECTS} 
+-	${AR} $@ $?
++	${AR} cr $@ $?
+ 	${RANLIB} $@
+ 
+ ${libbuild_dir}/libp@MPILIBNAME@.a: ${MPI_OBJECTS} 
+-	${AR} $@ $?
++	${AR} cr $@ $?
+ 	${RANLIB} $@
+ 
+ # We need to clean the srcdir of any .o files because they can confuse the
+--- mpich-1.2.7.orig/src/context/Makefile.in
++++ mpich-1.2.7/src/context/Makefile.in
+@@ -63,11 +63,11 @@
+ # can speed up the build (ranlibs can take a LONG time).  profile_all 
+ # is the same, but for the profile library
+ default_all: ${MPI_OBJECTS}
+-	${AR} ${libbuild_dir}/lib${MPILIBNAME}.a $?
++	${AR} cr ${libbuild_dir}/lib${MPILIBNAME}.a $?
+ profile_all: ${MPI_OBJECTS}
+-	${AR} ${libbuild_dir}/libp${MPILIBNAME}.a $?
++	${AR} cr ${libbuild_dir}/libp${MPILIBNAME}.a $?
+ default_conly: ${MPI_COBJECTS}
+-	${AR} ${libbuild_dir}/lib${MPILIBNAME}.a $?
++	${AR} cr ${libbuild_dir}/lib${MPILIBNAME}.a $?
+ 	${RANLIB} ${libbuild_dir}/lib${MPILIBNAME}.a
+ 
+ source_names:
+@@ -77,11 +77,11 @@
+ 	${CC} ${DEFS} ${INCLUDES} ${CFLAGS} ${OPTFLAGSC} ${OPTFLAGS} -c $<
+ 
+ ${libbuild_dir}/lib${MPILIBNAME}.a: ${MPI_OBJECTS} 
+-	${AR} $@ $?
++	${AR} cr $@ $?
+ 	${RANLIB} $@
+ 
+ ${libbuild_dir}/libp${MPILIBNAME}.a: ${MPI_OBJECTS} 
+-	${AR} $@ $?
++	${AR} cr $@ $?
+ 	${RANLIB} $@
+ 
+ # We need to clean the srcdir of any .o files because they can confuse the
+--- mpich-1.2.7.orig/src/dmpi/Makefile.in
++++ mpich-1.2.7/src/dmpi/Makefile.in
+@@ -38,9 +38,9 @@
+ # can speed up the build (ranlibs can take a LONG time).  profile_all 
+ # is the same, but for the profile library
+ default_all: ${MPI_OBJECTS}
+-	${AR} ${libbuild_dir}/lib@MPILIBNAME@.a $?
++	${AR} cr ${libbuild_dir}/lib@MPILIBNAME@.a $?
+ profile_all: ${MPI_OBJECTS}
+-	${AR} ${libbuild_dir}/libp@MPILIBNAME@.a $?
++	${AR} cr ${libbuild_dir}/libp@MPILIBNAME@.a $?
+ 
+ source_names:
+ 	@echo ${MPI_CSOURCES}
+@@ -49,11 +49,11 @@
+ 	${CC} ${DEFS} ${INCLUDES} ${CFLAGS} ${OPTFLAGSC} ${OPTFLAGS} -c $<
+ 
+ ${libbuild_dir}/lib@MPILIBNAME@.a: ${MPI_OBJECTS} 
+-	${AR} $@ $?
++	${AR} cr $@ $?
+ 	${RANLIB} $@
+ 
+ ${libbuild_dir}/libp@MPILIBNAME@.a: ${MPI_OBJECTS} 
+-	${AR} $@ $?
++	${AR} cr $@ $?
+ 	${RANLIB} $@
+ 
+ # We need to clean the srcdir of any .o files because they can confuse the
+--- mpich-1.2.7.orig/src/env/Makefile.in
++++ mpich-1.2.7/src/env/Makefile.in
+@@ -54,17 +54,17 @@
+ # is the same, but for the profile library
+ default_all: default_objs 
+ default_objs: ${MPI_OBJECTS}
+-	${AR} ${libbuild_dir}/lib${MPILIBNAME}.a $?
++	${AR} cr ${libbuild_dir}/lib${MPILIBNAME}.a $?
+ default_conly: ${MPI_COBJECTS}
+-	${AR} ${libbuild_dir}/lib${MPILIBNAME}.a $?
++	${AR} cr ${libbuild_dir}/lib${MPILIBNAME}.a $?
+ 	${RANLIB} ${libbuild_dir}/lib${MPILIBNAME}.a
+ profile_all: ${MPI_OBJECTS}
+-	${AR} ${libbuild_dir}/libp${MPILIBNAME}.a $?
++	${AR} cr ${libbuild_dir}/libp${MPILIBNAME}.a $?
+ 
+ ${MPI_OBJECTS} :  ${MPI_INCLUDE}
+ 
+ mpe_debug_objs: @MPE_MPI_EXT_O@
+-	${AR} ${libbuild_dir}/lib${MPILIBNAME}.a @MPE_MPI_EXT_O@
++	${AR} cr ${libbuild_dir}/lib${MPILIBNAME}.a @MPE_MPI_EXT_O@
+ 	${RANLIB} ${libbuild_dir}/lib${MPILIBNAME}.a
+ 
+ source_names:
+@@ -148,11 +148,11 @@
+ 	${CC} ${DEFS} ${CFLAGS} @NLS_DEFS@ -c ${srcdir}/nerrmsg.c
+ 
+ ${libbuild_dir}/lib${MPILIBNAME}.a: ${MPI_OBJECTS}
+-	${AR} $@ $?
++	${AR} cr $@ $?
+ 	${RANLIB} $@
+ 
+ ${libbuild_dir}/libp${MPILIBNAME}.a: ${MPI_OBJECTS}
+-	${AR} $@ $?
++	${AR} cr $@ $?
+ 	${RANLIB} $@
+ tstmsg:
+ 	${CC} ${CFLAGS} -DTEST_MSGS @NLS_DEFS@ -c nerrmsg.c
+--- mpich-1.2.7.orig/src/external/Makefile.in
++++ mpich-1.2.7/src/external/Makefile.in
+@@ -42,11 +42,11 @@
+ # is the same, but for the profile library
+ default_all: default_objs
+ default_objs: ${MPI_OBJECTS}
+-	${AR} ${libbuild_dir}/lib@MPILIBNAME@.a $?
++	${AR} cr ${libbuild_dir}/lib@MPILIBNAME@.a $?
+ profile_all: ${MPI_OBJECTS}
+-	${AR} ${libbuild_dir}/libp@MPILIBNAME@.a $?
++	${AR} cr ${libbuild_dir}/libp@MPILIBNAME@.a $?
+ default_conly: ${MPI_COBJECTS}
+-	${AR} ${libbuild_dir}/lib@MPILIBNAME@.a $?
++	${AR} cr ${libbuild_dir}/lib@MPILIBNAME@.a $?
+ 	${RANLIB} ${libbuild_dir}/lib@MPILIBNAME@.a
+ 
+ ${MPI_OBJECTS} :  ${MPI_INCLUDE}
+@@ -58,11 +58,11 @@
+ 	${CC} ${DEFS} ${INCLUDES} ${CFLAGS} ${OPTFLAGSC} ${OPTFLAGS} -c $<
+ 
+ ${libbuild_dir}/lib@MPILIBNAME@.a: ${MPI_OBJECTS}
+-	${AR} $@ $?
++	${AR} cr $@ $?
+ 	${RANLIB} $@
+ 
+ ${libbuild_dir}/libp@MPILIBNAME@.a: ${MPI_OBJECTS}
+-	${AR} $@ $?
++	${AR} cr $@ $?
+ 	${RANLIB} $@
+ # We need to clean the srcdir of any .o files because they can confuse the
+ # VPATH build process
+--- mpich-1.2.7.orig/src/fortran/configure.in
++++ mpich-1.2.7/src/fortran/configure.in
+@@ -1,6 +1,6 @@
++AC_PREREQ(2.59) dnl needed for SHELL, added in 2.13
+ AC_INIT(Makefile.in)
+ dnl
+-AC_PREREQ(2.13) dnl needed for SHELL, added in 2.13
+ rm -f ${srcdir}/mpi_fortconf.h mpi_fortconf.h
+ AC_CONFIG_HEADER(mpi_fortconf.h)
+ dnl We need install.sh, config.guess, etc. for the code that
+@@ -174,7 +174,7 @@
+ AC_SUBST(FORTRAN_INITOBJ)
+ AC_SUBST(INCLUDES)
+ if test "$pac_lib_mpi_is_building" = "yes" ; then 
+-    AC_DEFINE(BUILDING_IN_MPICH)
++    AC_DEFINE(BUILDING_IN_MPICH,1,[Define if building within MPICH1])
+     FORTRAN_INITOBJ="initfutil.o"
+     # We should replace mpicc with the values used in the MPICH build.
+     # This is best done with an environment variable (? what about 
+@@ -245,7 +245,7 @@
+ fi
+ 
+ if test "$pac_lib_mpi_is_building" = "yes" ; then
+-    AC_DEFINE(HAVE_MPI_F2C)
++    AC_DEFINE(HAVE_MPI_F2C,1,[Define if MP_Xxx_f2c functions available])
+ else
+     PAC_MPI_F2C
+ 
+@@ -401,7 +401,10 @@
+ AC_SUBST(F77_IN_C_LIBS)
+ AC_LANG_FORTRAN77
+ PAC_PROG_F77_EXCLAIM_COMMENTS(has_exclaim="yes",has_exclaim="no")
+-PAC_PROG_F77_NEW_CHAR_DECL(CHARDECL="(LEN=*)",CHARDECL="*(*)")
++dnl We're having trouble with this macro, so we use the old but
++dnl always valid format for character declarations
++dnl PAC_PROG_F77_NEW_CHAR_DECL(CHARDECL="(LEN=*)",CHARDECL="*(*)")
++CHARDECL="*(*)"
+ AC_SUBST(CHARDECL)
+ dnl PAC_F77_CHECK_COMPILER_OPTION(-g)
+ PAC_PROG_F77_HAS_INCDIR(include)
+@@ -438,7 +441,7 @@
+         data MPI_BOTTOM_PTR/0/, MPI_STATUS_IG_PTR/0/
+ 	data MPI_STATUSES_IG_PTR/0/
+ EOF
+-    AC_DEFINE(USE_POINTER_FOR_BOTTOM)
++    AC_DEFINE(USE_POINTER_FOR_BOTTOM,1[Define if pointer should be use for MPI_BOTTOM])
+     dnl Note that with this, we do not need the call to mpir_init_fcm
+     dnl in initfcmn.f .
+ else
+@@ -473,11 +476,16 @@
+ # If we have sizes for real and double, we do not need to call mpir_get_fsize
+ # at run time.
+ #
+-AC_TRY_COMPILE(,[      integer*1 i],has_integer_1=1,has_integer_1=0)
+-AC_TRY_COMPILE(,[      integer*2 i],has_integer_2=2,has_integer_2=0)
+-AC_TRY_COMPILE(,[      integer*4 i],has_integer_4=4,has_integer_4=0)
+-AC_TRY_COMPILE(,[      integer*8 i],has_integer_8=8,has_integer_8=0)
+-AC_TRY_COMPILE(,[      integer*16 i],has_integer_16=16,has_integer_16=0)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[      integer*1 i])],
++    has_integer_1=1,has_integer_1=0)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[      integer*2 i])],
++    has_integer_2=2,has_integer_2=0)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[      integer*4 i])],
++    has_integer_4=4,has_integer_4=0)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[      integer*8 i])],
++    has_integer_8=8,has_integer_8=0)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[      integer*16 i])],
++    has_integer_16=16,has_integer_16=0)
+ dnl PAC_PROG_F77_CHECK_SIZEOF(integer*1,0)
+ dnl PAC_PROG_F77_CHECK_SIZEOF(integer*2,0)
+ dnl PAC_PROG_F77_CHECK_SIZEOF(integer*4,0)
+@@ -487,9 +495,12 @@
+ dnl PAC_PROG_F77_CHECK_SIZEOF(real*4,0)
+ dnl PAC_PROG_F77_CHECK_SIZEOF(real*8,0)
+ dnl PAC_PROG_F77_CHECK_SIZEOF(real*16,0)
+-AC_TRY_COMPILE(,[      real*4 a],has_real_4=4,has_real_4=0)
+-AC_TRY_COMPILE(,[      real*8 a],has_real_8=8,has_real_8=0)
+-AC_TRY_COMPILE(,[      real*16 a],has_real_16=16,has_real_16=0)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[      real*4 a])],
++    has_real_4=4,has_real_4=0)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[      real*8 a])],
++    has_real_8=8,has_real_8=0)
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[      real*16 a])],
++    has_real_16=16,has_real_16=0)
+ 
+ 
+ # Compare the sizes of these types to the C types
+@@ -501,7 +512,7 @@
+ # Current bug: this is needed for mpi.h, which should eventually remove
+ #   the ifdef test on USE_STDARG 
+ # It is also used in the definition of MPIR_Err_setmsg.
+-PAC_HEADER_STDARG([AC_DEFINE(USE_STDARG)],[AC_DEFINE(USE_OLDSTYLE_STDARG)])
++PAC_HEADER_STDARG([AC_DEFINE(USE_STDARG,1,[if stdarg available])],[AC_DEFINE(USE_OLDSTYLE_STDARG,1,[Define if only old-style stdarg available])])
+ 
+ # Get defaults for cross compilation case
+ CROSS_SIZEOF_CHAR=${CROSS_SIZEOF_CHAR:-0}
+@@ -623,7 +634,7 @@
+ dnl
+ dnl Include a defined value for Fint is int
+ if test "$MPI_FINT_TYPE" = "int" ; then
+-    AC_DEFINE(FINT_IS_INT)
++    AC_DEFINE(FINT_IS_INT,,[Define if Fortran INTEGER is the same as C int])
+ fi
+ 
+ PAC_PROG_C_UNALIGNED_DOUBLES(,
+@@ -632,7 +643,7 @@
+ Fortran (the Fortran standard requires it).)])
+ 
+ if test "$enable_weak" = "yes" ; then
+-    PAC_PROG_C_WEAK_SYMBOLS(AC_DEFINE(HAVE_WEAK_SYMBOLS))
++    PAC_PROG_C_WEAK_SYMBOLS(AC_DEFINE(HAVE_WEAK_SYMBOLS,,[Define if weak symbols available]))
+ fi
+ 
+ #
+@@ -664,7 +675,7 @@
+     true_val="`echo $pac_cv_prog_f77_true_false_value | sed -e 's/ .*//g'`"
+     false_val="`echo $pac_cv_prog_f77_true_false_value | sed -e 's/.*  *//g'`"
+     if test -n "$true_val" -a -n "$false_val" ; then
+-        AC_DEFINE(F77_TRUE_VALUE_SET)
++        AC_DEFINE(F77_TRUE_VALUE_SET,,[Define if Fortran logical values known])
+         AC_DEFINE_UNQUOTED(F77_TRUE_VALUE,$true_val)
+         AC_DEFINE_UNQUOTED(F77_FALSE_VALUE,$false_val)
+ 	AC_MSG_RESULT([True is $true_val and False is $false_val])
+@@ -678,12 +689,13 @@
+ if test "$pac_lib_mpi_is_building" = "yes" ; then
+     AC_LANG_C
+     FARGOBJ="farg.o"
+-    AC_DEFINE(HAS_MPIR_ERR_SETMSG)
++    AC_DEFINE(HAS_MPIR_ERR_SETMSG,1,[Define if MPICH err msg routine available])
+ else
+     # Test for mpir_iargc; if not found, add farg.f.in
+     AC_MSG_CHECKING([for mpir_iargc provided for command line in Fortran])
+     AC_LANG_FORTRAN77
+-    AC_TRY_LINK(,[mpir_iargc()],found="yes",found="no")
++    AC_LINK_IFELSE([AC_LANG_PROGRAM(,[mpir_iargc()])],
++        found="yes",found="no")
+     if test "$found" = "no" ; then
+         AC_MSG_RESULT(no)
+         PAC_LANG_PUSH_COMPILERS
+@@ -721,7 +733,7 @@
+ 	    AC_MSG_WARN([You may have problems compiling the Fortran interface
+ specifically calls to  _fcdtocp])
+         elif test "$compile_check" = "yes" ; then
+-            AC_DEFINE(_TWO_WORD_FCD)
++            AC_DEFINE(_TWO_WORD_FCD,,[Define if Cray two-word FCD used])
+         fi
+         CFLAGS=$TEMP_CFLAGS
+     fi
+@@ -731,7 +743,7 @@
+     # This asserts that Fortran passes functions by passing the address of the
+     # pointer to the function.
+     # We really need a TEST for this
+-    AC_DEFINE(FORTRAN_SPECIAL_FUNCTION_PTR)
++    AC_DEFINE(FORTRAN_SPECIAL_FUNCTION_PTR,,[Define if function pointers special])
+     # Suggested values for these are
+     dnl CFLAGS=-O
+     dnl    #FFLAGS=-Oe,-U -Aabe ( Parameter e is not supported on  uxp/m )
+--- mpich-1.2.7.orig/src/fortran/configure
++++ mpich-1.2.7/src/fortran/configure
+@@ -1,80 +1,325 @@
+ #! /bin/sh
+-
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated automatically using autoconf version 2.13 
+-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
++# Generated by GNU Autoconf 2.59.
+ #
++# Copyright (C) 2003 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
++## --------------------- ##
++## M4sh Initialization.  ##
++## --------------------- ##
++
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++DUALCASE=1; export DUALCASE # for MKS sh
++
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
++fi
++
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    $as_unset $as_var
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
++
++
++# Name of the executable.
++as_me=`$as_basename "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)$' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
++  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\/\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++
++
++# PATH needs CR, and LINENO needs CR and PATH.
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conf$$.sh
++fi
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
++  # Find who we are.  Look in the path if we contain no path at all
++  # relative or not.
++  case $0 in
++    *[\\/]* ) as_myself=$0 ;;
++    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++
++       ;;
++  esac
++  # We did not find ourselves, most probably we were run as `sh COMMAND'
++  # in which case we are not to be found in the path.
++  if test "x$as_myself" = x; then
++    as_myself=$0
++  fi
++  if test ! -f "$as_myself"; then
++    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
++   { (exit 1); exit 1; }; }
++  fi
++  case $CONFIG_SHELL in
++  '')
++    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for as_base in sh bash ksh sh5; do
++	 case $as_dir in
++	 /*)
++	   if ("$as_dir/$as_base" -c '
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
++	     CONFIG_SHELL=$as_dir/$as_base
++	     export CONFIG_SHELL
++	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
++	   fi;;
++	 esac
++       done
++done
++;;
++  esac
++
++  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++  # uniformly replaced by the line number.  The first 'sed' inserts a
++  # line-number line before each line; the second 'sed' does the real
++  # work.  The second script uses 'N' to pair each line-number line
++  # with the numbered line, and appends trailing '-' during
++  # substitution so that $LINENO is not a special case at line end.
++  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
++  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
++  sed '=' <$as_myself |
++    sed '
++      N
++      s,$,-,
++      : loop
++      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      t loop
++      s,-$,,
++      s,^['$as_cr_digits']*\n,,
++    ' >$as_me.lineno &&
++  chmod +x $as_me.lineno ||
++    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++   { (exit 1); exit 1; }; }
++
++  # Don't try to exec as it changes $[0], causing all sort of problems
++  # (the dirname of $[0] is not the place where we might find the
++  # original and so on.  Autoconf is especially sensible to this).
++  . ./$as_me.lineno
++  # Exit status is that of the last command.
++  exit
++}
++
++
++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
++  *c*,-n*) ECHO_N= ECHO_C='
++' ECHO_T='	' ;;
++  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
++  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++esac
++
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++rm -f conf$$ conf$$.exe conf$$.file
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++  # We could just check for DJGPP; but this test a) works b) is more generic
++  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
++  if test -f conf$$.exe; then
++    # Don't use ln at all; we don't have any links
++    as_ln_s='cp -p'
++  else
++    as_ln_s='ln -s'
++  fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++  as_ln_s=ln
++else
++  as_ln_s='cp -p'
++fi
++rm -f conf$$ conf$$.exe conf$$.file
++
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  test -d ./-p && rmdir ./-p
++  as_mkdir_p=false
++fi
++
++as_executable_p="test -f"
++
++# Sed expression to map a string onto a valid CPP name.
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
++
++# Sed expression to map a string onto a valid variable name.
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++
+ 
+-# Defaults:
+-ac_help=
++# IFS
++# We need space, tab and new line, in precisely that order.
++as_nl='
++'
++IFS=" 	$as_nl"
++
++# CDPATH.
++$as_unset CDPATH
++
++
++# Name of the host.
++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# so uname gets run too.
++ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
++
++exec 6>&1
++
++#
++# Initializations.
++#
+ ac_default_prefix=/usr/local
+-# Any additions from configure.in:
+-ac_help="$ac_help
+---enable-cache  - Turn on configure caching"
+-ac_help="$ac_help
+---enable-strict  - Turn on strict compilation testing when using gcc"
+-ac_help="$ac_help
+---enable-echo    - Turn on echoing from within the configure script"
+-ac_help="$ac_help
+---enable-weak-symbols - Use weak symbols to provide the profiling interface
+-    (default)"
+-ac_help="$ac_help
+---enable-f90 - Find and use a Fortran 90 compiler (default:enable)"
+-ac_help="$ac_help
+---enable-f90modules - Build an MPI module for use with Fortran 90"
+-ac_help="$ac_help
+---enable-use-pointer - Use the common pointer extension for MPI_BOTTOM and
+-    related special values"
+-ac_help="$ac_help
+---with-flibname=name  - Specify name of library containing Fortran interface
+-routines"
+-ac_help="$ac_help
+---with-fwrapname=name  - Specify name of library containing Fortran interface
+-routines"
+-ac_help="$ac_help
+---with-mpe - MPI includes the MPE libraries"
+-ac_help="$ac_help
+---with-cross=file - Use the file for cross compilation.  The file should 
+-             contain assignments of the form
+-             CROSS_SIZEOF_INT=4
+-             for each cross compilation variable.  The command
+-                egrep 'CROSS_[A-Z_]*=' configure | sed 's/=.*//g'
+-             will list each variable"
+-ac_help="$ac_help
+---with-mpichconfig=file - Use file for the MPICH configuration.
+-              Normally, this file is mpichlib.conf, but other files
+-              may be used."
+-ac_help="$ac_help
+---with-subname=name - Use this name for forming the names of the 
+-              directories to install the mpif.h include file and 
+-              libraries, as well as the mpif77-name.conf file.  This
+-              should be used to support multiple Fortran compilers with
+-              a single MPICH build.  It must be used in conjunction with
+-              --with-mpichconfig"
+-ac_help="$ac_help
+---with-mpichbuilding - Assume that MPICH is being built"
+-ac_help="$ac_help
+---with-mpich=path  - Assume that we are building with MPICH"
+-ac_help="$ac_help
+---with-lammpi=path  - Assume that we are building with LAM/MPI"
+-ac_help="$ac_help
+---with-ibmmpi    - Use the IBM SP implementation of MPI"
+-ac_help="$ac_help
+---with-sgimpi    - Use the SGI implementation of MPI"
+-ac_help="$ac_help
+---with-mpichnt - Use MPICH for Windows NT "
++ac_config_libobj_dir=.
++cross_compiling=no
++subdirs=
++MFLAGS=
++MAKEFLAGS=
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++# Maximum number of lines to put in a shell here document.
++# This variable seems obsolete.  It should probably be removed, and
++# only ac_max_sed_lines should be used.
++: ${ac_max_here_lines=38}
++
++# Identity of this package.
++PACKAGE_NAME=
++PACKAGE_TARNAME=
++PACKAGE_VERSION=
++PACKAGE_STRING=
++PACKAGE_BUGREPORT=
++
++ac_unique_file="Makefile.in"
++# Factoring default headers for most tests.
++ac_includes_default="\
++#include <stdio.h>
++#if HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++#if HAVE_SYS_STAT_H
++# include <sys/stat.h>
++#endif
++#if STDC_HEADERS
++# include <stdlib.h>
++# include <stddef.h>
++#else
++# if HAVE_STDLIB_H
++#  include <stdlib.h>
++# endif
++#endif
++#if HAVE_STRING_H
++# if !STDC_HEADERS && HAVE_MEMORY_H
++#  include <memory.h>
++# endif
++# include <string.h>
++#endif
++#if HAVE_STRINGS_H
++# include <strings.h>
++#endif
++#if HAVE_INTTYPES_H
++# include <inttypes.h>
++#else
++# if HAVE_STDINT_H
++#  include <stdint.h>
++# endif
++#endif
++#if HAVE_UNISTD_H
++# include <unistd.h>
++#endif"
++
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS HAVE_MPID_FORTDEFS_H COPTIONS FLIBNAME FWRAPNAME hasMPE OPTFLAGS OPTFLAGSF MPI_STATUS_SIZE f77includedir f77libdir f77bindir subname libbuild_dir FORTRAN_INITOBJ INCLUDES MPIVERSION CC CFLAGS F77 FFLAGS LDFLAGS ac_ct_F77 EXEEXT OBJEXT FOPTIONS FLINKER F90 F90FLAGS ac_ct_F90 F90LINKER CXX MPIRUN_NP MPIEXEC_N MPICC MPIF77 MPIF90 MPICXX MPIEXEC MPIRUN MPIBOOT MPIUNBOOT MPCC MPXLF CXXFLAGS CPPFLAGS ac_ct_CXX MAKE VPATH SET_CFLAGS SET_MAKE AR RANLIB ac_ct_RANLIB F77LINKER CPP MPILIBNAME LIB_PATH BASE_LIB_LIST HASMPE F77_LDFLAGS BASE_FFLAGS includebuild_dir MPI_WITH_PMPI SHAREDKIND SHARED_LIB_SEARCH_PATH_LEADER SHARED_LIB_LOCALDIR sharedlibbuild_dir sharedlib_dir MPI2_OBJECTS TESTCPP F77_GETARGDECL F77_IARGC F77_GETARG FXX_MODULE F77_GETARG_FFLAGS F77_GETARG_LDFLAGS F90_GETARG_FFLAGS F90_GETARG_LDFLAGS FLIBS F77_NAME_MANGLE F77_IN_C_LIBS CHARDECL F77_INCDIR FINCLUDES F77_LIBDIR_LEADER MPIFPMPI EGREP F77_INT1 F77_INT2 F77_INT4 F77_INT8 F77_INT16 F77_REAL4 F77_REAL8 F77_REAL16 F77_COMPLEX8 F77_COMPLEX16 F77_COMPLEX32 MPI_FINT_TYPE FARGOBJ ADDRESS_KIND OFFSET_KIND F90_SUFFIX f90includedir f90libdir F90_LDFLAGS F90INC F90_MODINCFLAG F90MODINCSPEC F90LIB_PATH F90_LIBDIR_LEADER LIBOBJS LTLIBOBJS'
++ac_subst_files=''
+ 
+ # Initialize some variables set by options.
++ac_init_help=
++ac_init_version=false
+ # The variables have the same names as the options, with
+ # dashes changed to underlines.
+-build=NONE
+-cache_file=./config.cache
++cache_file=/dev/null
+ exec_prefix=NONE
+-host=NONE
+ no_create=
+-nonopt=NONE
+ no_recursion=
+ prefix=NONE
+ program_prefix=NONE
+@@ -83,10 +328,15 @@
+ silent=
+ site=
+ srcdir=
+-target=NONE
+ verbose=
+ x_includes=NONE
+ x_libraries=NONE
++
++# Installation directory options.
++# These are left unexpanded so users can "make install exec_prefix=/foo"
++# and all the variables that are supposed to be based on exec_prefix
++# by default will actually change.
++# Use braces instead of parens because sh, perl, etc. also accept them.
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+@@ -100,17 +350,9 @@
+ infodir='${prefix}/info'
+ mandir='${prefix}/man'
+ 
+-# Initialize some other variables.
+-subdirs=
+-MFLAGS= MAKEFLAGS=
+-SHELL=${CONFIG_SHELL-/bin/sh}
+-# Maximum number of lines to put in a shell here document.
+-ac_max_here_lines=12
+-
+ ac_prev=
+ for ac_option
+ do
+-
+   # If the previous option needs an argument, assign it.
+   if test -n "$ac_prev"; then
+     eval "$ac_prev=\$ac_option"
+@@ -118,59 +360,59 @@
+     continue
+   fi
+ 
+-  case "$ac_option" in
+-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+-  *) ac_optarg= ;;
+-  esac
++  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+ 
+   # Accept the important Cygnus configure options, so we can diagnose typos.
+ 
+-  case "$ac_option" in
++  case $ac_option in
+ 
+   -bindir | --bindir | --bindi | --bind | --bin | --bi)
+     ac_prev=bindir ;;
+   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+-    bindir="$ac_optarg" ;;
++    bindir=$ac_optarg ;;
+ 
+   -build | --build | --buil | --bui | --bu)
+-    ac_prev=build ;;
++    ac_prev=build_alias ;;
+   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+-    build="$ac_optarg" ;;
++    build_alias=$ac_optarg ;;
+ 
+   -cache-file | --cache-file | --cache-fil | --cache-fi \
+   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+     ac_prev=cache_file ;;
+   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+-    cache_file="$ac_optarg" ;;
++    cache_file=$ac_optarg ;;
++
++  --config-cache | -C)
++    cache_file=config.cache ;;
+ 
+   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+     ac_prev=datadir ;;
+   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+   | --da=*)
+-    datadir="$ac_optarg" ;;
++    datadir=$ac_optarg ;;
+ 
+   -disable-* | --disable-*)
+-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
++    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
+-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+-    fi
+-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+-    eval "enable_${ac_feature}=no" ;;
++    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++   { (exit 1); exit 1; }; }
++    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    eval "enable_$ac_feature=no" ;;
+ 
+   -enable-* | --enable-*)
+-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
++    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
+-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+-    fi
+-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+-    case "$ac_option" in
+-      *=*) ;;
++    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++   { (exit 1); exit 1; }; }
++    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    case $ac_option in
++      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+       *) ac_optarg=yes ;;
+     esac
+-    eval "enable_${ac_feature}='$ac_optarg'" ;;
++    eval "enable_$ac_feature='$ac_optarg'" ;;
+ 
+   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -179,95 +421,47 @@
+   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+   | --exec=* | --exe=* | --ex=*)
+-    exec_prefix="$ac_optarg" ;;
++    exec_prefix=$ac_optarg ;;
+ 
+   -gas | --gas | --ga | --g)
+     # Obsolete; use --with-gas.
+     with_gas=yes ;;
+ 
+-  -help | --help | --hel | --he)
+-    # Omit some internal or obsolete options to make the list less imposing.
+-    # This message is too long to be a string in the A/UX 3.1 sh.
+-    cat << EOF
+-Usage: configure [options] [host]
+-Options: [defaults in brackets after descriptions]
+-Configuration:
+-  --cache-file=FILE       cache test results in FILE
+-  --help                  print this message
+-  --no-create             do not create output files
+-  --quiet, --silent       do not print \`checking...' messages
+-  --version               print the version of autoconf that created configure
+-Directory and file names:
+-  --prefix=PREFIX         install architecture-independent files in PREFIX
+-                          [$ac_default_prefix]
+-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+-                          [same as prefix]
+-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
+-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
+-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
+-  --datadir=DIR           read-only architecture-independent data in DIR
+-                          [PREFIX/share]
+-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
+-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
+-                          [PREFIX/com]
+-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
+-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
+-  --includedir=DIR        C header files in DIR [PREFIX/include]
+-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
+-  --infodir=DIR           info documentation in DIR [PREFIX/info]
+-  --mandir=DIR            man documentation in DIR [PREFIX/man]
+-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
+-  --program-prefix=PREFIX prepend PREFIX to installed program names
+-  --program-suffix=SUFFIX append SUFFIX to installed program names
+-  --program-transform-name=PROGRAM
+-                          run sed PROGRAM on installed program names
+-EOF
+-    cat << EOF
+-Host type:
+-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
+-  --host=HOST             configure for HOST [guessed]
+-  --target=TARGET         configure for TARGET [TARGET=HOST]
+-Features and packages:
+-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+-  --x-includes=DIR        X include files are in DIR
+-  --x-libraries=DIR       X library files are in DIR
+-EOF
+-    if test -n "$ac_help"; then
+-      echo "--enable and --with options recognized:$ac_help"
+-    fi
+-    exit 0 ;;
++  -help | --help | --hel | --he | -h)
++    ac_init_help=long ;;
++  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
++    ac_init_help=recursive ;;
++  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
++    ac_init_help=short ;;
+ 
+   -host | --host | --hos | --ho)
+-    ac_prev=host ;;
++    ac_prev=host_alias ;;
+   -host=* | --host=* | --hos=* | --ho=*)
+-    host="$ac_optarg" ;;
++    host_alias=$ac_optarg ;;
+ 
+   -includedir | --includedir | --includedi | --included | --include \
+   | --includ | --inclu | --incl | --inc)
+     ac_prev=includedir ;;
+   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+   | --includ=* | --inclu=* | --incl=* | --inc=*)
+-    includedir="$ac_optarg" ;;
++    includedir=$ac_optarg ;;
+ 
+   -infodir | --infodir | --infodi | --infod | --info | --inf)
+     ac_prev=infodir ;;
+   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+-    infodir="$ac_optarg" ;;
++    infodir=$ac_optarg ;;
+ 
+   -libdir | --libdir | --libdi | --libd)
+     ac_prev=libdir ;;
+   -libdir=* | --libdir=* | --libdi=* | --libd=*)
+-    libdir="$ac_optarg" ;;
++    libdir=$ac_optarg ;;
+ 
+   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+   | --libexe | --libex | --libe)
+     ac_prev=libexecdir ;;
+   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+   | --libexe=* | --libex=* | --libe=*)
+-    libexecdir="$ac_optarg" ;;
++    libexecdir=$ac_optarg ;;
+ 
+   -localstatedir | --localstatedir | --localstatedi | --localstated \
+   | --localstate | --localstat | --localsta | --localst \
+@@ -276,19 +470,19 @@
+   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+-    localstatedir="$ac_optarg" ;;
++    localstatedir=$ac_optarg ;;
+ 
+   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+     ac_prev=mandir ;;
+   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+-    mandir="$ac_optarg" ;;
++    mandir=$ac_optarg ;;
+ 
+   -nfp | --nfp | --nf)
+     # Obsolete; use --without-fp.
+     with_fp=no ;;
+ 
+   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+-  | --no-cr | --no-c)
++  | --no-cr | --no-c | -n)
+     no_create=yes ;;
+ 
+   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+@@ -302,26 +496,26 @@
+   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+-    oldincludedir="$ac_optarg" ;;
++    oldincludedir=$ac_optarg ;;
+ 
+   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+     ac_prev=prefix ;;
+   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+-    prefix="$ac_optarg" ;;
++    prefix=$ac_optarg ;;
+ 
+   -program-prefix | --program-prefix | --program-prefi | --program-pref \
+   | --program-pre | --program-pr | --program-p)
+     ac_prev=program_prefix ;;
+   -program-prefix=* | --program-prefix=* | --program-prefi=* \
+   | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+-    program_prefix="$ac_optarg" ;;
++    program_prefix=$ac_optarg ;;
+ 
+   -program-suffix | --program-suffix | --program-suffi | --program-suff \
+   | --program-suf | --program-su | --program-s)
+     ac_prev=program_suffix ;;
+   -program-suffix=* | --program-suffix=* | --program-suffi=* \
+   | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+-    program_suffix="$ac_optarg" ;;
++    program_suffix=$ac_optarg ;;
+ 
+   -program-transform-name | --program-transform-name \
+   | --program-transform-nam | --program-transform-na \
+@@ -338,7 +532,7 @@
+   | --program-transfo=* | --program-transf=* \
+   | --program-trans=* | --program-tran=* \
+   | --progr-tra=* | --program-tr=* | --program-t=*)
+-    program_transform_name="$ac_optarg" ;;
++    program_transform_name=$ac_optarg ;;
+ 
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil)
+@@ -348,7 +542,7 @@
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+   | --sbi=* | --sb=*)
+-    sbindir="$ac_optarg" ;;
++    sbindir=$ac_optarg ;;
+ 
+   -sharedstatedir | --sharedstatedir | --sharedstatedi \
+   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+@@ -359,58 +553,57 @@
+   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+   | --sha=* | --sh=*)
+-    sharedstatedir="$ac_optarg" ;;
++    sharedstatedir=$ac_optarg ;;
+ 
+   -site | --site | --sit)
+     ac_prev=site ;;
+   -site=* | --site=* | --sit=*)
+-    site="$ac_optarg" ;;
++    site=$ac_optarg ;;
+ 
+   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+     ac_prev=srcdir ;;
+   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+-    srcdir="$ac_optarg" ;;
++    srcdir=$ac_optarg ;;
+ 
+   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+   | --syscon | --sysco | --sysc | --sys | --sy)
+     ac_prev=sysconfdir ;;
+   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+-    sysconfdir="$ac_optarg" ;;
++    sysconfdir=$ac_optarg ;;
+ 
+   -target | --target | --targe | --targ | --tar | --ta | --t)
+-    ac_prev=target ;;
++    ac_prev=target_alias ;;
+   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+-    target="$ac_optarg" ;;
++    target_alias=$ac_optarg ;;
+ 
+   -v | -verbose | --verbose | --verbos | --verbo | --verb)
+     verbose=yes ;;
+ 
+-  -version | --version | --versio | --versi | --vers)
+-    echo "configure generated by autoconf version 2.13"
+-    exit 0 ;;
++  -version | --version | --versio | --versi | --vers | -V)
++    ac_init_version=: ;;
+ 
+   -with-* | --with-*)
+-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
++    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
+-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+-    fi
++    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid package name: $ac_package" >&2
++   { (exit 1); exit 1; }; }
+     ac_package=`echo $ac_package| sed 's/-/_/g'`
+-    case "$ac_option" in
+-      *=*) ;;
++    case $ac_option in
++      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+       *) ac_optarg=yes ;;
+     esac
+-    eval "with_${ac_package}='$ac_optarg'" ;;
++    eval "with_$ac_package='$ac_optarg'" ;;
+ 
+   -without-* | --without-*)
+-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
++    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
+-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+-    fi
+-    ac_package=`echo $ac_package| sed 's/-/_/g'`
+-    eval "with_${ac_package}=no" ;;
++    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid package name: $ac_package" >&2
++   { (exit 1); exit 1; }; }
++    ac_package=`echo $ac_package | sed 's/-/_/g'`
++    eval "with_$ac_package=no" ;;
+ 
+   --x)
+     # Obsolete; use --with-x.
+@@ -421,99 +614,110 @@
+     ac_prev=x_includes ;;
+   -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+   | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+-    x_includes="$ac_optarg" ;;
++    x_includes=$ac_optarg ;;
+ 
+   -x-libraries | --x-libraries | --x-librarie | --x-librari \
+   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+     ac_prev=x_libraries ;;
+   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+-    x_libraries="$ac_optarg" ;;
++    x_libraries=$ac_optarg ;;
+ 
+-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
++  -*) { echo "$as_me: error: unrecognized option: $ac_option
++Try \`$0 --help' for more information." >&2
++   { (exit 1); exit 1; }; }
+     ;;
+ 
++  *=*)
++    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
++   { (exit 1); exit 1; }; }
++    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
++    eval "$ac_envvar='$ac_optarg'"
++    export $ac_envvar ;;
++
+   *)
+-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+-      echo "configure: warning: $ac_option: invalid host type" 1>&2
+-    fi
+-    if test "x$nonopt" != xNONE; then
+-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+-    fi
+-    nonopt="$ac_option"
++    # FIXME: should be removed in autoconf 3.0.
++    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
++    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+     ;;
+ 
+   esac
+ done
+ 
+ if test -n "$ac_prev"; then
+-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+-fi
+-
+-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+-
+-# File descriptor usage:
+-# 0 standard input
+-# 1 file creation
+-# 2 errors and warnings
+-# 3 some systems may open it to /dev/tty
+-# 4 used on the Kubota Titan
+-# 6 checking for... messages and results
+-# 5 compiler messages saved in config.log
+-if test "$silent" = yes; then
+-  exec 6>/dev/null
+-else
+-  exec 6>&1
++  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
++  { echo "$as_me: error: missing argument to $ac_option" >&2
++   { (exit 1); exit 1; }; }
+ fi
+-exec 5>./config.log
+ 
+-echo "\
+-This file contains any messages produced by compilers while
+-running configure, to aid debugging if configure makes a mistake.
+-" 1>&5
++# Be sure to have absolute paths.
++for ac_var in exec_prefix prefix
++do
++  eval ac_val=$`echo $ac_var`
++  case $ac_val in
++    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
++    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++   { (exit 1); exit 1; }; };;
++  esac
++done
+ 
+-# Strip out --no-create and --no-recursion so they do not pile up.
+-# Also quote any args containing shell metacharacters.
+-ac_configure_args=
+-for ac_arg
++# Be sure to have absolute paths.
++for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
++	      localstatedir libdir includedir oldincludedir infodir mandir
+ do
+-  case "$ac_arg" in
+-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+-  | --no-cr | --no-c) ;;
+-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
+-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
++  eval ac_val=$`echo $ac_var`
++  case $ac_val in
++    [\\/$]* | ?:[\\/]* ) ;;
++    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++   { (exit 1); exit 1; }; };;
+   esac
+ done
+ 
+-# NLS nuisances.
+-# Only set these to C if already set.  These must not be set unconditionally
+-# because not all systems understand e.g. LANG=C (notably SCO).
+-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+-# Non-C LC_CTYPE values break the ctype check.
+-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
++# There might be people who depend on the old broken behavior: `$host'
++# used to hold the argument of --host etc.
++# FIXME: To remove some day.
++build=$build_alias
++host=$host_alias
++target=$target_alias
++
++# FIXME: To remove some day.
++if test "x$host_alias" != x; then
++  if test "x$build_alias" = x; then
++    cross_compiling=maybe
++    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
++    If a cross compiler is detected then cross compile mode will be used." >&2
++  elif test "x$build_alias" != "x$host_alias"; then
++    cross_compiling=yes
++  fi
++fi
+ 
+-# confdefs.h avoids OS command line length limits that DEFS can exceed.
+-rm -rf conftest* confdefs.h
+-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+-echo > confdefs.h
++ac_tool_prefix=
++test -n "$host_alias" && ac_tool_prefix=$host_alias-
++
++test "$silent" = yes && exec 6>/dev/null
+ 
+-# A filename unique to this package, relative to the directory that
+-# configure is in, which we can look for to find out if srcdir is correct.
+-ac_unique_file=Makefile.in
+ 
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+   ac_srcdir_defaulted=yes
+   # Try the directory containing this script, then its parent.
+-  ac_prog=$0
+-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
++  ac_confdir=`(dirname "$0") 2>/dev/null ||
++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$0" : 'X\(//\)[^/]' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$0" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
+   srcdir=$ac_confdir
+   if test ! -r $srcdir/$ac_unique_file; then
+     srcdir=..
+@@ -523,13 +727,517 @@
+ fi
+ if test ! -r $srcdir/$ac_unique_file; then
+   if test "$ac_srcdir_defaulted" = yes; then
+-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
++    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
++   { (exit 1); exit 1; }; }
+   else
+-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
++    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++   { (exit 1); exit 1; }; }
+   fi
+ fi
+-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
++(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
++  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
++   { (exit 1); exit 1; }; }
++srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
++ac_env_build_alias_set=${build_alias+set}
++ac_env_build_alias_value=$build_alias
++ac_cv_env_build_alias_set=${build_alias+set}
++ac_cv_env_build_alias_value=$build_alias
++ac_env_host_alias_set=${host_alias+set}
++ac_env_host_alias_value=$host_alias
++ac_cv_env_host_alias_set=${host_alias+set}
++ac_cv_env_host_alias_value=$host_alias
++ac_env_target_alias_set=${target_alias+set}
++ac_env_target_alias_value=$target_alias
++ac_cv_env_target_alias_set=${target_alias+set}
++ac_cv_env_target_alias_value=$target_alias
++ac_env_F77_set=${F77+set}
++ac_env_F77_value=$F77
++ac_cv_env_F77_set=${F77+set}
++ac_cv_env_F77_value=$F77
++ac_env_FFLAGS_set=${FFLAGS+set}
++ac_env_FFLAGS_value=$FFLAGS
++ac_cv_env_FFLAGS_set=${FFLAGS+set}
++ac_cv_env_FFLAGS_value=$FFLAGS
++ac_env_LDFLAGS_set=${LDFLAGS+set}
++ac_env_LDFLAGS_value=$LDFLAGS
++ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
++ac_cv_env_LDFLAGS_value=$LDFLAGS
++ac_env_F90_set=${F90+set}
++ac_env_F90_value=$F90
++ac_cv_env_F90_set=${F90+set}
++ac_cv_env_F90_value=$F90
++ac_env_F90FLAGS_set=${F90FLAGS+set}
++ac_env_F90FLAGS_value=$F90FLAGS
++ac_cv_env_F90FLAGS_set=${F90FLAGS+set}
++ac_cv_env_F90FLAGS_value=$F90FLAGS
++ac_env_CXX_set=${CXX+set}
++ac_env_CXX_value=$CXX
++ac_cv_env_CXX_set=${CXX+set}
++ac_cv_env_CXX_value=$CXX
++ac_env_CXXFLAGS_set=${CXXFLAGS+set}
++ac_env_CXXFLAGS_value=$CXXFLAGS
++ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
++ac_cv_env_CXXFLAGS_value=$CXXFLAGS
++ac_env_CPPFLAGS_set=${CPPFLAGS+set}
++ac_env_CPPFLAGS_value=$CPPFLAGS
++ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
++ac_cv_env_CPPFLAGS_value=$CPPFLAGS
++ac_env_CPP_set=${CPP+set}
++ac_env_CPP_value=$CPP
++ac_cv_env_CPP_set=${CPP+set}
++ac_cv_env_CPP_value=$CPP
+ 
++#
++# Report the --help message.
++#
++if test "$ac_init_help" = "long"; then
++  # Omit some internal or obsolete options to make the list less imposing.
++  # This message is too long to be a string in the A/UX 3.1 sh.
++  cat <<_ACEOF
++\`configure' configures this package to adapt to many kinds of systems.
++
++Usage: $0 [OPTION]... [VAR=VALUE]...
++
++To assign environment variables (e.g., CC, CFLAGS...), specify them as
++VAR=VALUE.  See below for descriptions of some of the useful variables.
++
++Defaults for the options are specified in brackets.
++
++Configuration:
++  -h, --help              display this help and exit
++      --help=short        display options specific to this package
++      --help=recursive    display the short help of all the included packages
++  -V, --version           display version information and exit
++  -q, --quiet, --silent   do not print \`checking...' messages
++      --cache-file=FILE   cache test results in FILE [disabled]
++  -C, --config-cache      alias for \`--cache-file=config.cache'
++  -n, --no-create         do not create output files
++      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
++
++_ACEOF
++
++  cat <<_ACEOF
++Installation directories:
++  --prefix=PREFIX         install architecture-independent files in PREFIX
++			  [$ac_default_prefix]
++  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
++			  [PREFIX]
++
++By default, \`make install' will install all the files in
++\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
++an installation prefix other than \`$ac_default_prefix' using \`--prefix',
++for instance \`--prefix=\$HOME'.
++
++For better control, use the options below.
++
++Fine tuning of the installation directories:
++  --bindir=DIR           user executables [EPREFIX/bin]
++  --sbindir=DIR          system admin executables [EPREFIX/sbin]
++  --libexecdir=DIR       program executables [EPREFIX/libexec]
++  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
++  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
++  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
++  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
++  --libdir=DIR           object code libraries [EPREFIX/lib]
++  --includedir=DIR       C header files [PREFIX/include]
++  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
++  --infodir=DIR          info documentation [PREFIX/info]
++  --mandir=DIR           man documentation [PREFIX/man]
++_ACEOF
++
++  cat <<\_ACEOF
++_ACEOF
++fi
++
++if test -n "$ac_init_help"; then
++
++  cat <<\_ACEOF
++
++Optional Features:
++  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
++  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++--enable-cache  - Turn on configure caching
++--enable-strict  - Turn on strict compilation testing when using gcc
++--enable-echo    - Turn on echoing from within the configure script
++--enable-weak-symbols - Use weak symbols to provide the profiling interface
++    (default)
++--enable-f90 - Find and use a Fortran 90 compiler (default:enable)
++--enable-f90modules - Build an MPI module for use with Fortran 90
++--enable-use-pointer - Use the common pointer extension for MPI_BOTTOM and
++    related special values
++
++Optional Packages:
++  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
++  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
++--with-flibname=name  - Specify name of library containing Fortran interface
++routines
++--with-fwrapname=name  - Specify name of library containing Fortran interface
++routines
++--with-mpe - MPI includes the MPE libraries
++--with-cross=file - Use the file for cross compilation.  The file should
++             contain assignments of the form
++             CROSS_SIZEOF_INT=4
++             for each cross compilation variable.  The command
++                egrep 'CROSS_A-Z_*=' configure | sed 's/=.*//g'
++             will list each variable
++--with-mpichconfig=file - Use file for the MPICH configuration.
++              Normally, this file is mpichlib.conf, but other files
++              may be used.
++--with-subname=name - Use this name for forming the names of the
++              directories to install the mpif.h include file and
++              libraries, as well as the mpif77-name.conf file.  This
++              should be used to support multiple Fortran compilers with
++              a single MPICH build.  It must be used in conjunction with
++              --with-mpichconfig
++--with-mpichbuilding - Assume that MPICH is being built
++--with-mpich=path  - Assume that we are building with MPICH
++--with-lammpi=path  - Assume that we are building with LAM/MPI
++--with-ibmmpi    - Use the IBM SP implementation of MPI
++--with-sgimpi    - Use the SGI implementation of MPI
++--with-mpichnt - Use MPICH for Windows NT
++
++Some influential environment variables:
++  F77         Fortran 77 compiler command
++  FFLAGS      Fortran 77 compiler flags
++  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
++              nonstandard directory <lib dir>
++  F90         Fortran 90 compiler command
++  F90FLAGS    Fortran 90 compiler flags
++  CXX         C++ compiler command
++  CXXFLAGS    C++ compiler flags
++  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
++              headers in a nonstandard directory <include dir>
++  CPP         C preprocessor
++
++Use these variables to override the choices made by `configure' or to help
++it to find libraries and programs with nonstandard names/locations.
++
++_ACEOF
++fi
++
++if test "$ac_init_help" = "recursive"; then
++  # If there are subdirs, report their specific --help.
++  ac_popdir=`pwd`
++  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
++    test -d $ac_dir || continue
++    ac_builddir=.
++
++if test "$ac_dir" != .; then
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++  # A "../" for each directory in $ac_dir_suffix.
++  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
++else
++  ac_dir_suffix= ac_top_builddir=
++fi
++
++case $srcdir in
++  .)  # No --srcdir option.  We are building in place.
++    ac_srcdir=.
++    if test -z "$ac_top_builddir"; then
++       ac_top_srcdir=.
++    else
++       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
++    fi ;;
++  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_srcdir=$srcdir$ac_dir_suffix;
++    ac_top_srcdir=$srcdir ;;
++  *) # Relative path.
++    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++esac
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
++
++    cd $ac_dir
++    # Check for guested configure; otherwise get Cygnus style configure.
++    if test -f $ac_srcdir/configure.gnu; then
++      echo
++      $SHELL $ac_srcdir/configure.gnu  --help=recursive
++    elif test -f $ac_srcdir/configure; then
++      echo
++      $SHELL $ac_srcdir/configure  --help=recursive
++    elif test -f $ac_srcdir/configure.ac ||
++	   test -f $ac_srcdir/configure.in; then
++      echo
++      $ac_configure --help
++    else
++      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++    fi
++    cd "$ac_popdir"
++  done
++fi
++
++test -n "$ac_init_help" && exit 0
++if $ac_init_version; then
++  cat <<\_ACEOF
++
++Copyright (C) 2003 Free Software Foundation, Inc.
++This configure script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it.
++_ACEOF
++  exit 0
++fi
++exec 5>config.log
++cat >&5 <<_ACEOF
++This file contains any messages produced by compilers while
++running configure, to aid debugging if configure makes a mistake.
++
++It was created by $as_me, which was
++generated by GNU Autoconf 2.59.  Invocation command line was
++
++  $ $0 $@
++
++_ACEOF
++{
++cat <<_ASUNAME
++## --------- ##
++## Platform. ##
++## --------- ##
++
++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
++/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
++
++/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
++/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
++hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
++/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
++/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
++/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
++
++_ASUNAME
++
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  echo "PATH: $as_dir"
++done
++
++} >&5
++
++cat >&5 <<_ACEOF
++
++
++## ----------- ##
++## Core tests. ##
++## ----------- ##
++
++_ACEOF
++
++
++# Keep a trace of the command line.
++# Strip out --no-create and --no-recursion so they do not pile up.
++# Strip out --silent because we don't want to record it for future runs.
++# Also quote any args containing shell meta-characters.
++# Make two passes to allow for proper duplicate-argument suppression.
++ac_configure_args=
++ac_configure_args0=
++ac_configure_args1=
++ac_sep=
++ac_must_keep_next=false
++for ac_pass in 1 2
++do
++  for ac_arg
++  do
++    case $ac_arg in
++    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
++    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++    | -silent | --silent | --silen | --sile | --sil)
++      continue ;;
++    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    esac
++    case $ac_pass in
++    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
++    2)
++      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
++      if test $ac_must_keep_next = true; then
++	ac_must_keep_next=false # Got value, back to normal.
++      else
++	case $ac_arg in
++	  *=* | --config-cache | -C | -disable-* | --disable-* \
++	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
++	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
++	  | -with-* | --with-* | -without-* | --without-* | --x)
++	    case "$ac_configure_args0 " in
++	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
++	    esac
++	    ;;
++	  -* ) ac_must_keep_next=true ;;
++	esac
++      fi
++      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
++      # Get rid of the leading space.
++      ac_sep=" "
++      ;;
++    esac
++  done
++done
++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
++
++# When interrupted or exit'd, cleanup temporary files, and complete
++# config.log.  We remove comments because anyway the quotes in there
++# would cause problems or look ugly.
++# WARNING: Be sure not to use single quotes in there, as some shells,
++# such as our DU 5.0 friend, will then `close' the trap.
++trap 'exit_status=$?
++  # Save into config.log some information that might help in debugging.
++  {
++    echo
++
++    cat <<\_ASBOX
++## ---------------- ##
++## Cache variables. ##
++## ---------------- ##
++_ASBOX
++    echo
++    # The following way of writing the cache mishandles newlines in values,
++{
++  (set) 2>&1 |
++    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
++    *ac_space=\ *)
++      sed -n \
++	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
++      ;;
++    *)
++      sed -n \
++	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      ;;
++    esac;
++}
++    echo
++
++    cat <<\_ASBOX
++## ----------------- ##
++## Output variables. ##
++## ----------------- ##
++_ASBOX
++    echo
++    for ac_var in $ac_subst_vars
++    do
++      eval ac_val=$`echo $ac_var`
++      echo "$ac_var='"'"'$ac_val'"'"'"
++    done | sort
++    echo
++
++    if test -n "$ac_subst_files"; then
++      cat <<\_ASBOX
++## ------------- ##
++## Output files. ##
++## ------------- ##
++_ASBOX
++      echo
++      for ac_var in $ac_subst_files
++      do
++	eval ac_val=$`echo $ac_var`
++	echo "$ac_var='"'"'$ac_val'"'"'"
++      done | sort
++      echo
++    fi
++
++    if test -s confdefs.h; then
++      cat <<\_ASBOX
++## ----------- ##
++## confdefs.h. ##
++## ----------- ##
++_ASBOX
++      echo
++      sed "/^$/d" confdefs.h | sort
++      echo
++    fi
++    test "$ac_signal" != 0 &&
++      echo "$as_me: caught signal $ac_signal"
++    echo "$as_me: exit $exit_status"
++  } >&5
++  rm -f core *.core &&
++  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
++    exit $exit_status
++     ' 0
++for ac_signal in 1 2 13 15; do
++  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
++done
++ac_signal=0
++
++# confdefs.h avoids OS command line length limits that DEFS can exceed.
++rm -rf conftest* confdefs.h
++# AIX cpp loses on an empty file, so make sure it contains at least a newline.
++echo >confdefs.h
++
++# Predefined preprocessor variables.
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_NAME "$PACKAGE_NAME"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_VERSION "$PACKAGE_VERSION"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_STRING "$PACKAGE_STRING"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
++_ACEOF
++
++
++# Let the site file select an alternate cache file if it wants to.
+ # Prefer explicitly selected file to automatically selected ones.
+ if test -z "$CONFIG_SITE"; then
+   if test "x$prefix" != xNONE; then
+@@ -540,41 +1248,43 @@
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+-    echo "loading site script $ac_site_file"
++    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++echo "$as_me: loading site script $ac_site_file" >&6;}
++    sed 's/^/| /' "$ac_site_file" >&5
+     . "$ac_site_file"
+   fi
+ done
+ 
+-if test "$CONFIGURE_DEBUG_CACHE" = yes ; then 
++if test "$CONFIGURE_DEBUG_CACHE" = yes ; then
+     oldopts="$-"
+     clearMinusX=no
+-    set -x 
+-    if test "$oldopts" != "$-" ; then 
++    set -x
++    if test "$oldopts" != "$-" ; then
+         clearMinusX=yes
+     fi
+-fi 
++fi
+ if test "X$cache_system" = "X" ; then
+     # A default file name, just in case
+     cache_system="config.system"
+     if test "$cache_file" != "/dev/null" ; then
+         # Get the directory for the cache file, if any
+-	
++
+                 cache_system=`echo $cache_file | sed -e 's%^\(.*/\)[^/]*%\1config.system%'`
+-	
++
+         test "x$cache_system" = "x$cache_file" && cache_system="config.system"
+ #    else
+ #        We must *not* set enable_cache to no because we need to know if
+-#        enable_cache was not set.  
++#        enable_cache was not set.
+ #        enable_cache=no
+     fi
+ fi
+ #
+-# Get a test value and flag whether we should remove/replace the 
++# Get a test value and flag whether we should remove/replace the
+ # cache_system file (do so unless cache_system_ok is yes)
+ # FC and F77 should be synonyms.  Save both in case
+ # We include the xxxFLAGS in case the user is using the flags to change
+-# the language (either input or output) of the compiler.  E.g., 
+-# using -xarch=v9 on Solaris to select 64 bit output or using -D_BSD_SOURCE 
++# the language (either input or output) of the compiler.  E.g.,
++# using -xarch=v9 on Solaris to select 64 bit output or using -D_BSD_SOURCE
+ # with gcc to get different header files on input.
+ cleanargs=`echo "$CC $F77 $FC $CXX $F90 $CFLAGS $FFLAGS $CXXFLAGS $F90FLAGS $PATH" | tr '"' ' '`
+ if uname -srm >/dev/null 2>&1 ; then
+@@ -600,7 +1310,7 @@
+         elif test ! -f "$cache_system" -a -n "$cache_system_text" ; then
+ 	    # remove the cache file because it may not correspond to our
+ 	    # system
+-	    if test "$cache_file" != "/dev/null" ; then 
++	    if test "$cache_file" != "/dev/null" ; then
+ 	        rm -f $cache_file
+ 	    fi
+ 	    real_enable_cache="yes"
+@@ -615,7 +1325,7 @@
+     echo "loading cache $cache_file"
+     if test -w "$cache_file" ; then
+         # Clean the cache file (ergh)
+-	
++
+     rm -f confcache
+     sed -e "s/'\\\\''//g" -e "s/'\\\\/'/" -e "s/\\\\'/'/" \
+ 		-e "s/'\\\\''//g" $cache_file > confcache
+@@ -628,7 +1338,7 @@
+         else
+             echo "not updating unwritable cache $cache_file"
+         fi
+-    fi	
++    fi
+     rm -f confcache
+     if test "$DEBUG_AUTOCONF_CACHE" = "yes" ; then
+         echo "Results of cleaned cache file:"
+@@ -661,43 +1371,97 @@
+     set +x
+ fi
+ 
++# Check that the precious variables saved in the cache have kept the same
++# value.
++ac_cache_corrupted=false
++for ac_var in `(set) 2>&1 |
++	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++  eval ac_old_set=\$ac_cv_env_${ac_var}_set
++  eval ac_new_set=\$ac_env_${ac_var}_set
++  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
++  eval ac_new_val="\$ac_env_${ac_var}_value"
++  case $ac_old_set,$ac_new_set in
++    set,)
++      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
++      ac_cache_corrupted=: ;;
++    ,set)
++      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
++echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
++      ac_cache_corrupted=: ;;
++    ,);;
++    *)
++      if test "x$ac_old_val" != "x$ac_new_val"; then
++	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
++echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
++	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
++echo "$as_me:   former value:  $ac_old_val" >&2;}
++	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
++echo "$as_me:   current value: $ac_new_val" >&2;}
++	ac_cache_corrupted=:
++      fi;;
++  esac
++  # Pass precious variables to config.status.
++  if test "$ac_new_set" = set; then
++    case $ac_new_val in
++    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *) ac_arg=$ac_var=$ac_new_val ;;
++    esac
++    case " $ac_configure_args " in
++      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
++      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++    esac
++  fi
++done
++if $ac_cache_corrupted; then
++  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
++echo "$as_me: error: changes in the environment can compromise the build" >&2;}
++  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
+ ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-ac_exeext=
+-ac_objext=o
+-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+-    ac_n= ac_c='
+-' ac_t='	'
+-  else
+-    ac_n=-n ac_c= ac_t=
+-  fi
+-else
+-  ac_n= ac_c='\c' ac_t=
+-fi
+ 
+ 
+- rm -f ${srcdir}/mpi_fortconf.h mpi_fortconf.h
+ 
+-if test -f $CONFIG_AUX_DIR/install-sh ; then ac_aux_dir=$CONFIG_AUX_DIR 
+-else
+-ac_aux_dir=
+-# We force the test to use the absolute path to ensure that the install
+-# program can be used if we cd to a different directory before using
+-# install.
+-for ac_dir in config $srcdir/config; do
+-  if test -f $ac_dir/install-sh; then
+-    ac_aux_dir=$ac_dir
+-    abs_ac_aux_dir=`(cd $ac_aux_dir && pwd)`
+-    ac_install_sh="$abs_ac_aux_dir/install-sh -c"
+-    break
+-  elif test -f $ac_dir/install.sh; then
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++rm -f ${srcdir}/mpi_fortconf.h mpi_fortconf.h
++          ac_config_headers="$ac_config_headers mpi_fortconf.h"
++
++if test -f $CONFIG_AUX_DIR/install-sh ; then ac_aux_dir=$CONFIG_AUX_DIR
++else
++ac_aux_dir=
++# We force the test to use the absolute path to ensure that the install
++# program can be used if we cd to a different directory before using
++# install.
++for ac_dir in config $srcdir/config; do
++  if test -f $ac_dir/install-sh; then
++    ac_aux_dir=$ac_dir
++    abs_ac_aux_dir=`(cd $ac_aux_dir && pwd)`
++    ac_install_sh="$abs_ac_aux_dir/install-sh -c"
++    break
++  elif test -f $ac_dir/install.sh; then
+     ac_aux_dir=$ac_dir
+     abs_ac_aux_dir=`(cd $ac_aux_dir && pwd)`
+     ac_install_sh="$abs_ac_aux_dir/install.sh -c"
+@@ -706,7 +1470,9 @@
+ done
+ fi
+ if test -z "$ac_aux_dir"; then
+-  { echo "configure: error: can not find install-sh or install.sh in config $srcdir/config" 1>&2; exit 1; }
++  { { echo "$as_me:$LINENO: error: can not find install-sh or install.sh in config $srcdir/config" >&5
++echo "$as_me: error: can not find install-sh or install.sh in config $srcdir/config" >&2;}
++   { (exit 1); exit 1; }; }
+ fi
+ ac_config_guess=$ac_aux_dir/config.guess
+ ac_config_sub=$ac_aux_dir/config.sub
+@@ -725,8 +1491,7 @@
+   enable_cache="$enableval"
+ else
+   enable_cache="notgiven"
+-fi
+-
++fi;
+ 
+ 
+ 
+@@ -734,15 +1499,13 @@
+ if test "${enable_strict+set}" = set; then
+   enableval="$enable_strict"
+   COPTIONS="${COPTIONS} -Wall -O -Wstrict-prototypes -Wmissing-prototypes -DGCC_WALL"
+-fi
+-
++fi;
+ 
+ # Check whether --enable-echo or --disable-echo was given.
+ if test "${enable_echo+set}" = set; then
+   enableval="$enable_echo"
+   set -x
+-fi
+-
++fi;
+ 
+ # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
+ if test "${enable_weak_symbols+set}" = set; then
+@@ -750,8 +1513,7 @@
+   enable_weak=$enableval
+ else
+   enable_weak="yes"
+-fi
+-
++fi;
+ 
+ # Check whether --enable-f90 or --disable-f90 was given.
+ if test "${enable_f90+set}" = set; then
+@@ -759,8 +1521,7 @@
+   enable_f90=$enableval
+ else
+   enable_f90="yes"
+-fi
+-
++fi;
+ 
+ # Check whether --enable-f90modules or --disable-f90modules was given.
+ if test "${enable_f90modules+set}" = set; then
+@@ -768,8 +1529,7 @@
+   do_f90_modules=$enableval
+ else
+   do_f90_modules="yes"
+-fi
+-
++fi;
+ 
+ # Check whether --enable-use-pointer or --disable-use-pointer was given.
+ if test "${enable_use_pointer+set}" = set; then
+@@ -777,7 +1537,7 @@
+   use_pointer_in_f77=$enableval
+ else
+   use_pointer_in_f77="no"
+-fi
++fi;
+ 
+ 
+ # Check whether --with-flibname or --without-flibname was given.
+@@ -786,7 +1546,7 @@
+   FLIBNAMEOverride=$withval;set_FLIBNAME="yes"
+ else
+   FLIBNAME=mpich
+-fi
++fi;
+ 
+ 
+ 
+@@ -796,7 +1556,7 @@
+   FWRAPNAME=$withval;set_FWRAPNAME="yes"
+ else
+   FWRAPNAME=fmpich
+-fi
++fi;
+ 
+ 
+ 
+@@ -806,7 +1566,7 @@
+   hasMPE=$withval
+ else
+   hasMPE="unknown"
+-fi
++fi;
+ 
+ 
+ 
+@@ -816,21 +1576,21 @@
+   cross_file=$withval
+ else
+   cross_file=/dev/null
+-fi
++fi;
+ 
+ 
+ # Check whether --with-mpichconfig or --without-mpichconfig was given.
+ if test "${with_mpichconfig+set}" = set; then
+   withval="$with_mpichconfig"
+-  if test -z "$withval" -o "X$withval" = "Xyes" ; then 
++  if test -z "$withval" -o "X$withval" = "Xyes" ; then
+     mpichconfig_file=../../util/mpichlib.conf
+-else 
++else
+     mpichconfig_file=$withval
+ fi
+ 
+ else
+   mpichconfig_file=""
+-fi
++fi;
+ 
+ 
+ # Check whether --with-subname or --without-subname was given.
+@@ -839,8 +1599,7 @@
+   subname=$withval
+ else
+   subname=""
+-fi
+-
++fi;
+ 
+ 
+ # Propagate any optimization flags
+@@ -848,18 +1607,20 @@
+ 
+ 
+ 
++
+ # Check whether --with-mpichbuilding or --without-mpichbuilding was given.
+ if test "${with_mpichbuilding+set}" = set; then
+   withval="$with_mpichbuilding"
+   pac_lib_mpi_is_building=$withval
+ else
+   pac_lib_mpi_is_building="no"
+-fi
+-
++fi;
+ 
+ 
+ if test -n "$subname" -a -z "$mpichconfig_file" ; then
+-    { echo "configure: error: Must specify --with-mpichconfig with --with-subname" 1>&2; exit 1; }
++    { { echo "$as_me:$LINENO: error: Must specify --with-mpichconfig with --with-subname" >&5
++echo "$as_me: error: Must specify --with-mpichconfig with --with-subname" >&2;}
++   { (exit 1); exit 1; }; }
+ fi
+ 
+ # Read any cross-compilation variable values
+@@ -875,7 +1636,7 @@
+ #
+ # Handle the FLIBNAMEOverride after the argument processing and loading
+ # of the mpichconfig file
+-if test "$set_FLIBNAME" = "yes" ; then 
++if test "$set_FLIBNAME" = "yes" ; then
+    FLIBNAME=$FLIBNAMEOverride
+ fi
+ 
+@@ -883,7 +1644,8 @@
+ # Set size of MPI_Status
+ #
+ if test -z "$MPI_STATUS_SIZE" ; then
+-    echo "configure: warning: MPI_STATUS_SIZE was not defined!" 1>&2
++    { echo "$as_me:$LINENO: WARNING: MPI_STATUS_SIZE was not defined!" >&5
++echo "$as_me: WARNING: MPI_STATUS_SIZE was not defined!" >&2;}
+     # The default size is 4
+     MPI_STATUS_SIZE=4
+ fi
+@@ -924,20 +1686,21 @@
+ 
+ 
+ 
+-if test "$pac_lib_mpi_is_building" = "yes" ; then 
+-    cat >> confdefs.h <<\EOF
++if test "$pac_lib_mpi_is_building" = "yes" ; then
++
++cat >>confdefs.h <<\_ACEOF
+ #define BUILDING_IN_MPICH 1
+-EOF
++_ACEOF
+ 
+     FORTRAN_INITOBJ="initfutil.o"
+     # We should replace mpicc with the values used in the MPICH build.
+-    # This is best done with an environment variable (? what about 
++    # This is best done with an environment variable (? what about
+     # config.status re-execution?)
+     INCLUDES="$mpich_includes"
+     if test "$hasMPE" = "unknown" ; then
+ 	hasMPE="yes"
+     fi
+-    
++
+ fi
+ # Directory for building the library in (in src if not specified)
+ if test -z "$libbuild_dir" ; then
+@@ -948,398 +1711,739 @@
+ 
+ 
+ 
+-for ac_prog in cc xlC xlc pgcc icc gcc 
++
++for ac_prog in cc xlC xlc pgcc icc gcc
+ do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:957: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_CC="$ac_prog"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CC="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+ fi
+ fi
+-CC="$ac_cv_prog_CC"
++CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$ac_t""$CC" 1>&6
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$CC" && break
++  test -n "$CC" && break
+ done
+ 
+-test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:988: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+-
+-ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-cat > conftest.$ac_ext << EOF
+-
+-#line 999 "configure"
+-#include "confdefs.h"
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable cc found in \$PATH" >&5
++echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
++   { (exit 1); exit 1; }; }
+ 
+-main(){return(0);}
+-EOF
+-if { (eval echo configure:1004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  ac_cv_prog_cc_works=yes
+-  # If we can't run a trivial program, we are probably using a cross compiler.
+-  if (./conftest; exit) 2>/dev/null; then
+-    ac_cv_prog_cc_cross=no
+-  else
+-    ac_cv_prog_cc_cross=yes
+-  fi
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_prog_cc_works=no
+-fi
+-rm -fr conftest*
+-ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+-if test $ac_cv_prog_cc_works = no; then
+-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+-fi
+-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1030: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+-cross_compiling=$ac_cv_prog_cc_cross
++echo "$as_me:$LINENO: checking whether the C compiler sets its return status correctly" >&5
++echo $ECHO_N "checking whether the C compiler sets its return status correctly... $ECHO_C" >&6
+ 
+-echo $ac_n "checking whether the C compiler sets its return status correctly""... $ac_c" 1>&6
+-echo "configure:1035: checking whether the C compiler sets its return status correctly" >&5
+ 
+ ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-cat > conftest.$ac_ext <<EOF
+-#line 1045 "configure"
+-#include "confdefs.h"
+-
+-int main() {
++int
++main ()
++{
+ int a = bzzzt;
+-; return 0; }
+-EOF
+-if { (eval echo configure:1052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   notbroken=no
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  notbroken=yes
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++notbroken=yes
+ fi
+-rm -f conftest*
+-echo "$ac_t""$notbroken" 1>&6
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $notbroken" >&5
++echo "${ECHO_T}$notbroken" >&6
+ if test "$notbroken" = "no" ; then
+-    { echo "configure: error: installation or configuration problem: C compiler does not
+-correctly set error code when a fatal error occurs" 1>&2; exit 1; }
++    { { echo "$as_me:$LINENO: error: installation or configuration problem: C compiler does not
++correctly set error code when a fatal error occurs" >&5
++echo "$as_me: error: installation or configuration problem: C compiler does not
++correctly set error code when a fatal error occurs" >&2;}
++   { (exit 1); exit 1; }; }
+ fi
+ 
+-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:1069: checking whether we are using GNU C" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.c <<EOF
+-#ifdef __GNUC__
+-  yes;
+-#endif
+-EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+-  ac_cv_prog_gcc=yes
+-else
+-  ac_cv_prog_gcc=no
+-fi
+-fi
+ 
+-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+-if test "$ac_cv_prog_gcc" = yes; then
++if test "$ac_cv_c_compiler_gnu" = yes; then
+   GCC=yes
+ else
+   GCC=
+ fi
+ 
+ 
+-echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:1094: checking for working const" >&5
+-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 1099 "configure"
+-#include "confdefs.h"
++echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
++if test "${ac_cv_c_const+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-int main() {
++int
++main ()
++{
++/* FIXME: Include the comments suggested by Paul. */
++#ifndef __cplusplus
++  /* Ultrix mips cc rejects this.  */
++  typedef int charset[2];
++  const charset x;
++  /* SunOS 4.1.1 cc rejects this.  */
++  char const *const *ccp;
++  char **p;
++  /* NEC SVR4.0.2 mips cc rejects this.  */
++  struct point {int x, y;};
++  static struct point const zero = {0,0};
++  /* AIX XL C 1.02.0.0 rejects this.
++     It does not let you subtract one const X* pointer from another in
++     an arm of an if-expression whose if-part is not a constant
++     expression */
++  const char *g = "string";
++  ccp = &g + (g ? g-g : 0);
++  /* HPUX 7.0 cc rejects these. */
++  ++ccp;
++  p = (char**) ccp;
++  ccp = (char const *const *) p;
++  { /* SCO 3.2v4 cc rejects this.  */
++    char *t;
++    char const *s = 0 ? (char *) 0 : (char const *) 0;
++
++    *t++ = 0;
++  }
++  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
++    int x[] = {25, 17};
++    const int *foo = &x[0];
++    ++foo;
++  }
++  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
++    typedef const int *iptr;
++    iptr p = 0;
++    ++p;
++  }
++  { /* AIX XL C 1.02.0.0 rejects this saying
++       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
++    struct s { int j; const int *ap[3]; };
++    struct s *b; b->j = 5;
++  }
++  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
++    const int foo = 10;
++  }
++#endif
+ 
+-/* Ultrix mips cc rejects this.  */
+-typedef int charset[2]; const charset x;
+-/* SunOS 4.1.1 cc rejects this.  */
+-char const *const *ccp;
+-char **p;
+-/* NEC SVR4.0.2 mips cc rejects this.  */
+-struct point {int x, y;};
+-static struct point const zero = {0,0};
+-/* AIX XL C 1.02.0.0 rejects this.
+-   It does not let you subtract one const X* pointer from another in an arm
+-   of an if-expression whose if-part is not a constant expression */
+-const char *g = "string";
+-ccp = &g + (g ? g-g : 0);
+-/* HPUX 7.0 cc rejects these. */
+-++ccp;
+-p = (char**) ccp;
+-ccp = (char const *const *) p;
+-{ /* SCO 3.2v4 cc rejects this.  */
+-  char *t;
+-  char const *s = 0 ? (char *) 0 : (char const *) 0;
+-
+-  *t++ = 0;
+-}
+-{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+-  int x[] = {25, 17};
+-  const int *foo = &x[0];
+-  ++foo;
+-}
+-{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+-  typedef const int *iptr;
+-  iptr p = 0;
+-  ++p;
+-}
+-{ /* AIX XL C 1.02.0.0 rejects this saying
+-     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+-  struct s { int j; const int *ap[3]; };
+-  struct s *b; b->j = 5;
+-}
+-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+-  const int foo = 10;
++  ;
++  return 0;
+ }
+-
+-; return 0; }
+-EOF
+-if { (eval echo configure:1148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   ac_cv_c_const=yes
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  ac_cv_c_const=no
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_c_const=no
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+-echo "$ac_t""$ac_cv_c_const" 1>&6
++echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
++echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+-  cat >> confdefs.h <<\EOF
+-#define const 
+-EOF
++
++cat >>confdefs.h <<\_ACEOF
++#define const
++_ACEOF
+ 
+ fi
+ 
+-cat > conftest.$ac_ext <<EOF
+-#line 1169 "configure"
+-#include "confdefs.h"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-int main() {
++int
++main ()
++{
+ long long i;
+-; return 0; }
+-EOF
+-if { (eval echo configure:1176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
+-  cat >> confdefs.h <<\EOF
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LONG_LONG 1
+-EOF
++_ACEOF
+ 
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest*
+-cat > conftest.$ac_ext <<EOF
+-#line 1188 "configure"
+-#include "confdefs.h"
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-int main() {
++int
++main ()
++{
+ long double d;
+-; return 0; }
+-EOF
+-if { (eval echo configure:1195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
+-  cat >> confdefs.h <<\EOF
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LONG_DOUBLE 1
+-EOF
++_ACEOF
+ 
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ save_FFLAGS="$FFLAGS"
+-if test -z "$F77"; then
+-  for ac_prog in g77 f77 f2c
+-do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1213: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$F77"; then
+   ac_cv_prog_F77="$F77" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_F77="$ac_prog"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+ fi
+ fi
+-F77="$ac_cv_prog_F77"
++F77=$ac_cv_prog_F77
+ if test -n "$F77"; then
+-  echo "$ac_t""$F77" 1>&6
++  echo "$as_me:$LINENO: result: $F77" >&5
++echo "${ECHO_T}$F77" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$F77" && break
++  done
++fi
++if test -z "$F77"; then
++  ac_ct_F77=$F77
++  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_F77"; then
++  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_F77="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_F77=$ac_cv_prog_ac_ct_F77
++if test -n "$ac_ct_F77"; then
++  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
++echo "${ECHO_T}$ac_ct_F77" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$F77" && break
++  test -n "$ac_ct_F77" && break
+ done
+ 
+-    test -z "$F77" && { echo "configure: error: no acceptable Fortran 77 compiler found in \$PATH" 1>&2; exit 1; }
++  F77=$ac_ct_F77
+ fi
+ 
+-echo $ac_n "checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1246: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works" >&5
+ 
+-ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++# Provide some information about the compiler.
++echo "$as_me:2124:" \
++     "checking for Fortran 77 compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++rm -f a.out
+ 
+-cat > conftest.$ac_ext << EOF
++cat >conftest.$ac_ext <<_ACEOF
++      program main
+ 
+-      program conftest
+       end
++_ACEOF
++ac_clean_files_save=$ac_clean_files
++ac_clean_files="$ac_clean_files a.out a.exe b.out"
++# Try to create an executable without -o first, disregard a.out.
++# It will help us diagnose broken compilers, and finding out an intuition
++# of exeext.
++echo "$as_me:$LINENO: checking for Fortran 77 compiler default output file name" >&5
++echo $ECHO_N "checking for Fortran 77 compiler default output file name... $ECHO_C" >&6
++ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
++  (eval $ac_link_default) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  # Find the output, starting from the most likely.  This scheme is
++# not robust to junk in `.', hence go to wildcards (a.*) only as a last
++# resort.
++
++# Be careful to initialize this variable, since it used to be cached.
++# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
++ac_cv_exeext=
++# b.out is created by i960 compilers.
++for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++do
++  test -f "$ac_file" || continue
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
++	;;
++    conftest.$ac_ext )
++	# This is the source file.
++	;;
++    [ab].out )
++	# We found the default executable, but exeext='' is most
++	# certainly right.
++	break;;
++    *.* )
++	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	# FIXME: I believe we export ac_cv_exeext for Libtool,
++	# but it would be cool to find out if it's true.  Does anybody
++	# maintain Libtool? --akim.
++	export ac_cv_exeext
++	break;;
++    * )
++	break;;
++  esac
++done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-EOF
+-if { (eval echo configure:1259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  ac_cv_prog_f77_works=yes
+-  # If we can't run a trivial program, we are probably using a cross compiler.
+-  if (./conftest; exit) 2>/dev/null; then
+-    ac_cv_prog_f77_cross=no
++{ { echo "$as_me:$LINENO: error: Fortran 77 compiler cannot create executables
++See \`config.log' for more details." >&5
++echo "$as_me: error: Fortran 77 compiler cannot create executables
++See \`config.log' for more details." >&2;}
++   { (exit 77); exit 77; }; }
++fi
++
++ac_exeext=$ac_cv_exeext
++echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6
++
++# Check the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++echo "$as_me:$LINENO: checking whether the Fortran 77 compiler works" >&5
++echo $ECHO_N "checking whether the Fortran 77 compiler works... $ECHO_C" >&6
++# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
++# If not cross compiling, check that we can run a simple program.
++if test "$cross_compiling" != yes; then
++  if { ac_try='./$ac_file'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++    cross_compiling=no
+   else
+-    ac_cv_prog_f77_cross=yes
++    if test "$cross_compiling" = maybe; then
++	cross_compiling=yes
++    else
++	{ { echo "$as_me:$LINENO: error: cannot run Fortran 77 compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run Fortran 77 compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++    fi
+   fi
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_prog_f77_works=no
+ fi
+-rm -fr conftest*
+-ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-echo "$ac_t""$ac_cv_prog_f77_works" 1>&6
+-if test $ac_cv_prog_f77_works = no; then
+-  { echo "configure: error: installation or configuration problem: Fortran 77 compiler cannot create executables." 1>&2; exit 1; }
+-fi
+-echo $ac_n "checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1285: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "$ac_t""$ac_cv_prog_f77_cross" 1>&6
+-cross_compiling=$ac_cv_prog_f77_cross
+-
+-echo $ac_n "checking whether we are using GNU Fortran 77""... $ac_c" 1>&6
+-echo "configure:1290: checking whether we are using GNU Fortran 77" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_g77'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.fpp <<EOF
+-#ifdef __GNUC__
+-  yes
+-#endif
+-EOF
+-if { ac_try='$F77 -E conftest.fpp'; { (eval echo configure:1299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+-  ac_cv_prog_g77=yes
++echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++
++rm -f a.out a.exe conftest$ac_cv_exeext b.out
++ac_clean_files=$ac_clean_files_save
++# Check the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
++echo "$as_me:$LINENO: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6
++
++echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  # If both `conftest.exe' and `conftest' are `present' (well, observable)
++# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
++# work properly (i.e., refer to `conftest.exe'), while it won't with
++# `rm'.
++for ac_file in conftest.exe conftest conftest.*; do
++  test -f "$ac_file" || continue
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
++    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	  export ac_cv_exeext
++	  break;;
++    * ) break;;
++  esac
++done
+ else
+-  ac_cv_prog_g77=no
+-fi
+-fi
++  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++rm -f conftest$ac_cv_exeext
++echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++echo "${ECHO_T}$ac_cv_exeext" >&6
++
++rm -f conftest.$ac_ext
++EXEEXT=$ac_cv_exeext
++ac_exeext=$EXEEXT
++echo "$as_me:$LINENO: checking for suffix of object files" >&5
++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
++if test "${ac_cv_objext+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++      program main
+ 
+-echo "$ac_t""$ac_cv_prog_g77" 1>&6
++      end
++_ACEOF
++rm -f conftest.o conftest.obj
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
++    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
++       break;;
++  esac
++done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-if test $ac_cv_prog_g77 = yes; then
+-  G77=yes
+-  ac_test_FFLAGS="${FFLAGS+set}"
+-  ac_save_FFLAGS="$FFLAGS"
+-  FFLAGS=
+-  echo $ac_n "checking whether $F77 accepts -g""... $ac_c" 1>&6
+-echo "configure:1314: checking whether $F77 accepts -g" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_f77_g'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++rm -f conftest.$ac_cv_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6
++OBJEXT=$ac_cv_objext
++ac_objext=$OBJEXT
++# If we don't use `.F' as extension, the preprocessor is not run on the
++# input file.  (Note that this only needs to work for GNU compilers.)
++ac_save_ext=$ac_ext
++ac_ext=F
++echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
++if test "${ac_cv_f77_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat > conftest.f << EOF
+-       program conftest
+-       end
+-EOF
+-if test -z "`$F77 -g -c conftest.f 2>&1`"; then
++  cat >conftest.$ac_ext <<_ACEOF
++      program main
++#ifndef __GNUC__
++       choke me
++#endif
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_f77_compiler_gnu=$ac_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
++ac_ext=$ac_save_ext
++ac_test_FFLAGS=${FFLAGS+set}
++ac_save_FFLAGS=$FFLAGS
++FFLAGS=
++echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_f77_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  FFLAGS=-g
++cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   ac_cv_prog_f77_g=yes
+ else
+-  ac_cv_prog_f77_g=no
+-fi
+-rm -f conftest*
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
++ac_cv_prog_f77_g=no
+ fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-echo "$ac_t""$ac_cv_prog_f77_g" 1>&6
+-  if test "$ac_test_FFLAGS" = set; then
+-    FFLAGS="$ac_save_FFLAGS"
+-  elif test $ac_cv_prog_f77_g = yes; then
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
++echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
++if test "$ac_test_FFLAGS" = set; then
++  FFLAGS=$ac_save_FFLAGS
++elif test $ac_cv_prog_f77_g = yes; then
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+     FFLAGS="-g -O2"
+   else
+-    FFLAGS="-O2"
++    FFLAGS="-g"
+   fi
+ else
+-  G77=
+-  test "${FFLAGS+set}" = set || FFLAGS="-g"
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++    FFLAGS="-O2"
++  else
++    FFLAGS=
++  fi
+ fi
+ 
++G77=`test $ac_compiler_gnu = yes && echo yes`
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
+ FFLAGS="$save_FFLAGS"
+ 
+ if test -z "$FLINKER" ; then
+@@ -1348,133 +2452,299 @@
+ 
+ # We need F90 to get the OFFSET_KIND and ADDRESS_KIND values.
+ if test "$enable_f90" != "no" ; then
+-    
+-if test -z "$F90" ; then
+-    for ac_prog in f90 xlf90 pgf90 ifort epcf90 f95 fort xlf95 lf95 pathf90 g95 fc ifc efc
+-do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1359: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_F90'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++    # This is the fortran90 version of f90 language support
++ac_ext=${ac_f90ext-f}
++ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
++ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f90_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in f90 xlf90 pgf90 ifort epcf90 f95 fort xlf95 lf95 pathf90 g95 gfortran ifc efc
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_F90+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$F90"; then
+   ac_cv_prog_F90="$F90" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_F90="$ac_prog"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_F90="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+ fi
+ fi
+-F90="$ac_cv_prog_F90"
++F90=$ac_cv_prog_F90
+ if test -n "$F90"; then
+-  echo "$ac_t""$F90" 1>&6
++  echo "$as_me:$LINENO: result: $F90" >&5
++echo "${ECHO_T}$F90" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$F90" && break
++    test -n "$F90" && break
++  done
++fi
++if test -z "$F90"; then
++  ac_ct_F90=$F90
++  for ac_prog in f90 xlf90 pgf90 ifort epcf90 f95 fort xlf95 lf95 pathf90 g95 gfortran ifc efc
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_F90+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_F90"; then
++  ac_cv_prog_ac_ct_F90="$ac_ct_F90" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_F90="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+ done
+ 
+-    test -z "$F90" && echo "configure: warning: no acceptable Fortran 90 compiler found in \$PATH" 1>&2
+ fi
+-if test -n "$F90" ; then
+-     echo $ac_n "checking for extension for Fortran 90 programs""... $ac_c" 1>&6
+-echo "configure:1392: checking for extension for Fortran 90 programs" >&5
+-pac_cv_f90_ext="f90"
+-cat > conftest.$pac_cv_f90_ext <<EOF
+-      program conftest
+-      end
+-EOF
+-ac_compile='${F90-f90} -c $F90FLAGS conftest.$pac_cv_f90_ext 1>&5'
+-if { (eval echo configure:1399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } ; then
+-    echo "$ac_t""f90" 1>&6
++fi
++ac_ct_F90=$ac_cv_prog_ac_ct_F90
++if test -n "$ac_ct_F90"; then
++  echo "$as_me:$LINENO: result: $ac_ct_F90" >&5
++echo "${ECHO_T}$ac_ct_F90" >&6
+ else
+-    rm -f conftest*
+-    pac_cv_f90_ext="f"
+-    cat > conftest.$pac_cv_f90_ext <<EOF
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$ac_ct_F90" && break
++done
++
++  F90=$ac_ct_F90
++fi
++
++
++# once we find the compiler, confirm the extension
++echo "$as_me:$LINENO: checking that $ac_ext works as the extension for Fortran 90 program" >&5
++echo $ECHO_N "checking that $ac_ext works as the extension for Fortran 90 program... $ECHO_C" >&6
++cat > conftest.$ac_ext <<EOF
++      program conftest
++      end
++EOF
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } ; then
++    echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++    echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    echo "$as_me:$LINENO: checking for extension for Fortran 90 programs" >&5
++echo $ECHO_N "checking for extension for Fortran 90 programs... $ECHO_C" >&6
++    ac_ext="f90"
++    cat > conftest.$ac_ext <<EOF
+       program conftest
+       end
+ EOF
+-    if { (eval echo configure:1408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } ; then
+-	echo "$ac_t""f" 1>&6
++    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } ; then
++        echo "$as_me:$LINENO: result: f90" >&5
++echo "${ECHO_T}f90" >&6
+     else
+-        echo "$ac_t""unknown!" 1>&6
+-    fi
+-fi
+-echo $ac_n "checking whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1415: checking whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) works" >&5
+-
+-# We cannot use _LANG_FORTRAN90 here because we will usually be executing this
+-# test in the context of _PROG_F90, which is a require on _LANG_FORTRAN90.
+-# Instead, we insert the necessary code from _LANG_FORTRAN90 here
+-ac_ext=$pac_cv_f90_ext
+-ac_compile='${F90-f90} -c $F90FLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F90-f90} -o conftest${ac_exeext} $F90FLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$pac_cv_prog_f90_cross
+-# Include a Fortran 90 construction to distinguish between Fortran 77 
+-# and Fortran 90 compilers.
+-cat >conftest.$ac_ext <<EOF
++        rm -f conftest*
++        ac_ext="f"
++        cat > conftest.$ac_ext <<EOF
+       program conftest
+-      integer, dimension(10) :: n
+       end
+ EOF
+-if { (eval echo configure:1431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeect} ; then
+-    pac_cv_prog_f90_works="yes"
+-    if (./conftest; exit) 2>/dev/null ; then
+-        pac_cv_prog_f90_cross="no"
++        if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } ; then
++            echo "$as_me:$LINENO: result: f" >&5
++echo "${ECHO_T}f" >&6
++        else
++            echo "$as_me:$LINENO: result: unknown!" >&5
++echo "${ECHO_T}unknown!" >&6
++        fi
++    fi
++    ac_f90ext=$ac_ext
++    if test "$ac_ext" = "f90" ; then
++        pac_cv_f90_ext_f90=yes
+     else
+-        pac_cv_prog_f90_cross="yes"
++        pac_cv_f90_ext_f90=no
+     fi
++    pac_cv_f90_ext=$ac_ext
++    rm -f conftest*
++fi
++# Provide some information about the compiler.
++echo "$as_me:2607:" \
++     "checking for Fortran 90 compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++
++# If we don't use `.F' as extension, the preprocessor is not run on the
++# input file.
++if test -n "$F90" ; then
++    ac_save_ext=$ac_ext
++    ac_ext=F
++    echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 90 compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU Fortran 90 compiler... $ECHO_C" >&6
++if test "${ac_cv_f90_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  pac_cv_prog_f90_works="no"
++  cat >conftest.$ac_ext <<_ACEOF
++      program main
++#ifndef __GNUC__
++       choke me
++#endif
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f90_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_f90_compiler_gnu=$ac_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_f90_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_f90_compiler_gnu" >&6
++    ac_ext=$ac_save_ext
++    G90=`test $ac_compiler_gnu = yes && echo yes`
++    ac_test_F90FLAGS=${F90FLAGS+set}
++ac_save_F90FLAGS=$F90FLAGS
++F90FLAGS=
++echo "$as_me:$LINENO: checking whether $F90 accepts -g" >&5
++echo $ECHO_N "checking whether $F90 accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_f90_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  F90FLAGS=-g
++cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f90_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_f90_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_prog_f90_g=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_f90_g" >&5
++echo "${ECHO_T}$ac_cv_prog_f90_g" >&6
++if test "$ac_test_F90FLAGS" = set; then
++  F90FLAGS=$ac_save_F90FLAGS
++elif test $ac_cv_prog_f90_g = yes; then
++  if test "$G90" = yes; then
++    F90FLAGS="-g -O2"
++  else
++    F90FLAGS="-g"
++  fi
++else
++  if test "$G90" = yes; then
++    F90FLAGS="-O2"
++  else
++    F90FLAGS=
++  fi
++fi
+ fi
+-rm -f conftest*
+-# The intel compiler sometimes generates these work.pc and .pcl files
+-rm -f work.pc work.pcl
+ ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-echo "$ac_t""$pac_cv_prog_f90_works" 1>&6
+-if test $pac_cv_prog_f90_works = no; then
+-  echo "configure: warning: installation or configuration problem: Fortran 90 compiler cannot create executables." 1>&2
+-fi
+-echo $ac_n "checking whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1458: checking whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "$ac_t""$pac_cv_prog_f90_cross" 1>&6
+-cross_compiling=$pac_cv_prog_f90_cross
+-
+-fi
+-ac_f90ext=$pac_cv_f90_ext
+-ac_f90compile='${F90-f90} -c $F90FLAGS conftest.$ac_f90ext 1>&5'
+-ac_f90link='${F90-f90} -o conftest${ac_exeext} $F90FLAGS $LDFLAGS conftest.$ac_f90ext $LIBS 1>&5'
+-# Check for problems with Intel efc compiler, if the compiler works
+-if test "$pac_cv_prog_f90_works" = yes ; then
+-    cat > conftest.$ac_f90ext <<EOF
+-        program main
+-        end
+-EOF
+-    pac_msg=`$F90 -o conftest $F90FLAGS $LDFLAGS conftest.$ac_f90ext $LIBS 2>&1 | grep 'bfd assertion fail'`
+-    if test -n "$pac_msg" ; then
+-        pac_msg=`$F90 -o conftest $F90FLAGS $LDFLAGS conftest.$ac_f90ext -i_dynamic $LIBS 2>&1 | grep 'bfd assertion fail'`
+-        if test -z "$pac_msg" ; then LDFLAGS="-i_dynamic" ; fi
+-        # There should really be f90linker flags rather than generic ldflags.
+-    fi
+-fi
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+     if test -z "$F90" ; then
+         enable_f90=no
+@@ -1483,7 +2753,7 @@
+             F90LINKER="$F90"
+         fi
+     fi
+-    
++
+ fi
+ 
+ 
+@@ -1491,36 +2761,36 @@
+ 
+ 
+ 
++
+ # Check whether --with-mpich or --without-mpich was given.
+ if test "${with_mpich+set}" = set; then
+   withval="$with_mpich"
+   ac_mpi_type=mpich
+-fi
++fi;
+ 
+ # Check whether --with-lammpi or --without-lammpi was given.
+ if test "${with_lammpi+set}" = set; then
+   withval="$with_lammpi"
+   ac_mpi_type=lammpi
+-fi
++fi;
+ 
+ # Check whether --with-ibmmpi or --without-ibmmpi was given.
+ if test "${with_ibmmpi+set}" = set; then
+   withval="$with_ibmmpi"
+   ac_mpi_type=ibmmpi
+-fi
++fi;
+ 
+ # Check whether --with-sgimpi or --without-sgimpi was given.
+ if test "${with_sgimpi+set}" = set; then
+   withval="$with_sgimpi"
+   ac_mpi_type=sgimpi
+-fi
++fi;
+ 
+ # Check whether --with-mpichnt or --without-mpichnt was given.
+ if test "${with_mpichnt+set}" = set; then
+   withval="$with_mpichnt"
+   ac_mpi_type=mpichnt
+-fi
+-
++fi;
+ 
+ if test "X$ac_mpi_type" = "X" ; then
+     if test "X" != "X" ; then
+@@ -1532,11 +2802,16 @@
+ if test "$ac_mpi_type" = "unknown" -a "$pac_lib_mpi_is_building" = "yes" ; then
+     ac_mpi_type="mpich"
+ fi
++# Set defaults
++MPIRUN_NP="-np "
++MPIEXEC_N="-n "
++
++
+ case $ac_mpi_type in
+ 	mpich)
+                                 if test "X$pac_lib_mpi_is_building" != "Xyes" ; then
+             save_PATH="$PATH"
+-            if test "$with_mpich" != "yes" -a "$with_mpich" != "no" ; then 
++            if test "$with_mpich" != "yes" -a "$with_mpich" != "no" ; then
+ 		# Look for commands; if not found, try adding bin to the
+ 		# path
+ 		if test ! -x $with_mpich/mpicc -a -x $with_mpich/bin/mpicc ; then
+@@ -1546,261 +2821,328 @@
+             fi
+             # Extract the first word of "mpicc", so it can be a program name with args.
+ set dummy mpicc; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1551: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_MPICC'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_MPICC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case "$MPICC" in
+-  /*)
++  case $MPICC in
++  [\\/]* | ?:[\\/]*)
+   ac_cv_path_MPICC="$MPICC" # Let the user override the test with a path.
+   ;;
+-  ?:/*)			 
+-  ac_cv_path_MPICC="$MPICC" # Let the user override the test with a dos path.
+-  ;;
+   *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do 
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_MPICC="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_MPICC="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+   ;;
+ esac
+ fi
+-MPICC="$ac_cv_path_MPICC"
++MPICC=$ac_cv_path_MPICC
++
+ if test -n "$MPICC"; then
+-  echo "$ac_t""$MPICC" 1>&6
++  echo "$as_me:$LINENO: result: $MPICC" >&5
++echo "${ECHO_T}$MPICC" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+             TESTCC=${CC-cc}
+             CC="$MPICC"
+             # Extract the first word of "mpif77", so it can be a program name with args.
+ set dummy mpif77; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1588: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_MPIF77'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_MPIF77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case "$MPIF77" in
+-  /*)
++  case $MPIF77 in
++  [\\/]* | ?:[\\/]*)
+   ac_cv_path_MPIF77="$MPIF77" # Let the user override the test with a path.
+   ;;
+-  ?:/*)			 
+-  ac_cv_path_MPIF77="$MPIF77" # Let the user override the test with a dos path.
+-  ;;
+   *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do 
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_MPIF77="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_MPIF77="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+   ;;
+ esac
+ fi
+-MPIF77="$ac_cv_path_MPIF77"
++MPIF77=$ac_cv_path_MPIF77
++
+ if test -n "$MPIF77"; then
+-  echo "$ac_t""$MPIF77" 1>&6
++  echo "$as_me:$LINENO: result: $MPIF77" >&5
++echo "${ECHO_T}$MPIF77" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+             TESTF77=${F77-f77}
+             F77="$MPIF77"
+             # Extract the first word of "mpif90", so it can be a program name with args.
+ set dummy mpif90; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1625: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_MPIF90'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_MPIF90+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case "$MPIF90" in
+-  /*)
++  case $MPIF90 in
++  [\\/]* | ?:[\\/]*)
+   ac_cv_path_MPIF90="$MPIF90" # Let the user override the test with a path.
+   ;;
+-  ?:/*)			 
+-  ac_cv_path_MPIF90="$MPIF90" # Let the user override the test with a dos path.
+-  ;;
+   *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do 
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_MPIF90="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_MPIF90="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+   ;;
+ esac
+ fi
+-MPIF90="$ac_cv_path_MPIF90"
++MPIF90=$ac_cv_path_MPIF90
++
+ if test -n "$MPIF90"; then
+-  echo "$ac_t""$MPIF90" 1>&6
++  echo "$as_me:$LINENO: result: $MPIF90" >&5
++echo "${ECHO_T}$MPIF90" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+             TESTF90=${F90-f90}
+             F90="$MPIF90"
+             # Extract the first word of "mpiCC", so it can be a program name with args.
+ set dummy mpiCC; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1662: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_MPICXX'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_MPICXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case "$MPICXX" in
+-  /*)
++  case $MPICXX in
++  [\\/]* | ?:[\\/]*)
+   ac_cv_path_MPICXX="$MPICXX" # Let the user override the test with a path.
+   ;;
+-  ?:/*)			 
+-  ac_cv_path_MPICXX="$MPICXX" # Let the user override the test with a dos path.
+-  ;;
+   *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do 
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_MPICXX="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_MPICXX="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+   ;;
+ esac
+ fi
+-MPICXX="$ac_cv_path_MPICXX"
++MPICXX=$ac_cv_path_MPICXX
++
+ if test -n "$MPICXX"; then
+-  echo "$ac_t""$MPICXX" 1>&6
++  echo "$as_me:$LINENO: result: $MPICXX" >&5
++echo "${ECHO_T}$MPICXX" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+             TESTCXX=${CXX-CC}
+             CXX="$MPICXX"
+ 	    # We may want to restrict this to the path containing mpirun
++	    # Extract the first word of "mpiexec", so it can be a program name with args.
++set dummy mpiexec; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_MPIEXEC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $MPIEXEC in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_MPIEXEC="$MPIEXEC" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_MPIEXEC="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  ;;
++esac
++fi
++MPIEXEC=$ac_cv_path_MPIEXEC
++
++if test -n "$MPIEXEC"; then
++  echo "$as_me:$LINENO: result: $MPIEXEC" >&5
++echo "${ECHO_T}$MPIEXEC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
+ 	    # Extract the first word of "mpirun", so it can be a program name with args.
+ set dummy mpirun; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1700: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_MPIRUN'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_MPIRUN+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case "$MPIRUN" in
+-  /*)
++  case $MPIRUN in
++  [\\/]* | ?:[\\/]*)
+   ac_cv_path_MPIRUN="$MPIRUN" # Let the user override the test with a path.
+   ;;
+-  ?:/*)			 
+-  ac_cv_path_MPIRUN="$MPIRUN" # Let the user override the test with a dos path.
+-  ;;
+   *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do 
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_MPIRUN="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_MPIRUN="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+   ;;
+ esac
+ fi
+-MPIRUN="$ac_cv_path_MPIRUN"
++MPIRUN=$ac_cv_path_MPIRUN
++
+ if test -n "$MPIRUN"; then
+-  echo "$ac_t""$MPIRUN" 1>&6
++  echo "$as_me:$LINENO: result: $MPIRUN" >&5
++echo "${ECHO_T}$MPIRUN" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+ 	    # Extract the first word of "mpichboot", so it can be a program name with args.
+ set dummy mpichboot; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1735: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_MPIBOOT'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_MPIBOOT+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case "$MPIBOOT" in
+-  /*)
++  case $MPIBOOT in
++  [\\/]* | ?:[\\/]*)
+   ac_cv_path_MPIBOOT="$MPIBOOT" # Let the user override the test with a path.
+   ;;
+-  ?:/*)			 
+-  ac_cv_path_MPIBOOT="$MPIBOOT" # Let the user override the test with a dos path.
+-  ;;
+   *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do 
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_MPIBOOT="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_MPIBOOT="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+   ;;
+ esac
+ fi
+-MPIBOOT="$ac_cv_path_MPIBOOT"
++MPIBOOT=$ac_cv_path_MPIBOOT
++
+ if test -n "$MPIBOOT"; then
+-  echo "$ac_t""$MPIBOOT" 1>&6
++  echo "$as_me:$LINENO: result: $MPIBOOT" >&5
++echo "${ECHO_T}$MPIBOOT" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+ 	    # Extract the first word of "mpichstop", so it can be a program name with args.
+ set dummy mpichstop; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1770: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_MPIUNBOOT'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_MPIUNBOOT+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case "$MPIUNBOOT" in
+-  /*)
++  case $MPIUNBOOT in
++  [\\/]* | ?:[\\/]*)
+   ac_cv_path_MPIUNBOOT="$MPIUNBOOT" # Let the user override the test with a path.
+   ;;
+-  ?:/*)			 
+-  ac_cv_path_MPIUNBOOT="$MPIUNBOOT" # Let the user override the test with a dos path.
+-  ;;
+   *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do 
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_MPIUNBOOT="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_MPIUNBOOT="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+   ;;
+ esac
+ fi
+-MPIUNBOOT="$ac_cv_path_MPIUNBOOT"
++MPIUNBOOT=$ac_cv_path_MPIUNBOOT
++
+ if test -n "$MPIUNBOOT"; then
+-  echo "$ac_t""$MPIUNBOOT" 1>&6
++  echo "$as_me:$LINENO: result: $MPIUNBOOT" >&5
++echo "${ECHO_T}$MPIUNBOOT" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+ 	    PATH="$save_PATH"
+   	    MPILIBNAME="mpich"
+-        else 
++        else
+ 	    # All of the above should have been passed in the environment!
+ 	    :
+         fi
+@@ -1813,87 +3155,143 @@
+         CPPFLAGS="$save_CPPFLAGS -I$with_mpichnt/include"
+         save_LDFLAGS="$LDFLAGS"
+         LDFLAGS="$save_LDFLAGS -L$with_mpichnt/lib"
+-        echo $ac_n "checking for MPI_Init in -lmpich""... $ac_c" 1>&6
+-echo "configure:1818: checking for MPI_Init in -lmpich" >&5
+-ac_lib_var=`echo mpich'_'MPI_Init | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++        echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5
++echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6
++if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_save_LIBS="$LIBS"
++  ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmpich  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1826 "configure"
+-#include "confdefs.h"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
+ /* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
+ /* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char MPI_Init();
+-
+-int main() {
+-MPI_Init()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
++   builtin and then its argument prototype would still apply.  */
++char MPI_Init ();
++int
++main ()
++{
++MPI_Init ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_mpich_MPI_Init=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_mpich_MPI_Init=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5
++echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6
++if test $ac_cv_lib_mpich_MPI_Init = yes; then
+   found="yes"
+ else
+-  echo "$ac_t""no" 1>&6
+-found="no"
++  found="no"
+ fi
+ 
+         if test "$found" = "no" ; then
+-          echo $ac_n "checking for MPI_Init in -lmpich2""... $ac_c" 1>&6
+-echo "configure:1860: checking for MPI_Init in -lmpich2" >&5
+-ac_lib_var=`echo mpich2'_'MPI_Init | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++          echo "$as_me:$LINENO: checking for MPI_Init in -lmpich2" >&5
++echo $ECHO_N "checking for MPI_Init in -lmpich2... $ECHO_C" >&6
++if test "${ac_cv_lib_mpich2_MPI_Init+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_save_LIBS="$LIBS"
++  ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmpich2  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1868 "configure"
+-#include "confdefs.h"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
+ /* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
+ /* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char MPI_Init();
+-
+-int main() {
+-MPI_Init()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
++   builtin and then its argument prototype would still apply.  */
++char MPI_Init ();
++int
++main ()
++{
++MPI_Init ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_mpich2_MPI_Init=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_mpich2_MPI_Init=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_mpich2_MPI_Init" >&5
++echo "${ECHO_T}$ac_cv_lib_mpich2_MPI_Init" >&6
++if test $ac_cv_lib_mpich2_MPI_Init = yes; then
+   found="yes"
+ else
+-  echo "$ac_t""no" 1>&6
+-found="no"
++  found="no"
+ fi
+ 
+         fi
+@@ -1906,7 +3304,7 @@
+ 
+ 	lammpi)
+ 	                        save_PATH="$PATH"
+-        if test "$with_mpich" != "yes" -a "$with_mpich" != "no" ; then 
++        if test "$with_mpich" != "yes" -a "$with_mpich" != "no" ; then
+ 	    # Look for commands; if not found, try adding bin to the path
+ 		if test ! -x $with_lammpi/mpicc -a -x $with_lammpi/bin/mpicc ; then
+ 			with_lammpi="$with_lammpi/bin"
+@@ -1915,148 +3313,164 @@
+         fi
+         # Extract the first word of "mpicc", so it can be a program name with args.
+ set dummy mpicc; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1920: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_MPICC'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_MPICC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case "$MPICC" in
+-  /*)
++  case $MPICC in
++  [\\/]* | ?:[\\/]*)
+   ac_cv_path_MPICC="$MPICC" # Let the user override the test with a path.
+   ;;
+-  ?:/*)			 
+-  ac_cv_path_MPICC="$MPICC" # Let the user override the test with a dos path.
+-  ;;
+   *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do 
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_MPICC="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_MPICC="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+   ;;
+ esac
+ fi
+-MPICC="$ac_cv_path_MPICC"
++MPICC=$ac_cv_path_MPICC
++
+ if test -n "$MPICC"; then
+-  echo "$ac_t""$MPICC" 1>&6
++  echo "$as_me:$LINENO: result: $MPICC" >&5
++echo "${ECHO_T}$MPICC" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+         TESTCC=${CC-cc}
+         CC="$MPICC"
+         # Extract the first word of "mpif77", so it can be a program name with args.
+ set dummy mpif77; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1957: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_MPIF77'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_MPIF77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case "$MPIF77" in
+-  /*)
++  case $MPIF77 in
++  [\\/]* | ?:[\\/]*)
+   ac_cv_path_MPIF77="$MPIF77" # Let the user override the test with a path.
+   ;;
+-  ?:/*)			 
+-  ac_cv_path_MPIF77="$MPIF77" # Let the user override the test with a dos path.
+-  ;;
+   *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do 
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_MPIF77="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_MPIF77="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+   ;;
+ esac
+ fi
+-MPIF77="$ac_cv_path_MPIF77"
++MPIF77=$ac_cv_path_MPIF77
++
+ if test -n "$MPIF77"; then
+-  echo "$ac_t""$MPIF77" 1>&6
++  echo "$as_me:$LINENO: result: $MPIF77" >&5
++echo "${ECHO_T}$MPIF77" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+         TESTF77=${F77-f77}
+         F77="$MPIF77"
+         # Extract the first word of "mpif90", so it can be a program name with args.
+ set dummy mpif90; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1994: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_MPIF90'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_MPIF90+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case "$MPIF90" in
+-  /*)
++  case $MPIF90 in
++  [\\/]* | ?:[\\/]*)
+   ac_cv_path_MPIF90="$MPIF90" # Let the user override the test with a path.
+   ;;
+-  ?:/*)			 
+-  ac_cv_path_MPIF90="$MPIF90" # Let the user override the test with a dos path.
+-  ;;
+   *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do 
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_MPIF90="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_MPIF90="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+   ;;
+ esac
+ fi
+-MPIF90="$ac_cv_path_MPIF90"
++MPIF90=$ac_cv_path_MPIF90
++
+ if test -n "$MPIF90"; then
+-  echo "$ac_t""$MPIF90" 1>&6
++  echo "$as_me:$LINENO: result: $MPIF90" >&5
++echo "${ECHO_T}$MPIF90" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+         TESTF90=${F90-f90}
+         F90="$MPIF90"
+         # Extract the first word of "mpiCC", so it can be a program name with args.
+ set dummy mpiCC; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2031: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_MPICXX'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_MPICXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case "$MPICXX" in
+-  /*)
++  case $MPICXX in
++  [\\/]* | ?:[\\/]*)
+   ac_cv_path_MPICXX="$MPICXX" # Let the user override the test with a path.
+   ;;
+-  ?:/*)			 
+-  ac_cv_path_MPICXX="$MPICXX" # Let the user override the test with a dos path.
+-  ;;
+   *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do 
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_MPICXX="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_MPICXX="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+   ;;
+ esac
+ fi
+-MPICXX="$ac_cv_path_MPICXX"
++MPICXX=$ac_cv_path_MPICXX
++
+ if test -n "$MPICXX"; then
+-  echo "$ac_t""$MPICXX" 1>&6
++  echo "$as_me:$LINENO: result: $MPICXX" >&5
++echo "${ECHO_T}$MPICXX" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+         TESTCXX=${CXX-CC}
+@@ -2069,6 +3483,91 @@
+ 	;;
+ 
+ 	ibmmpi)
++	for ac_prog in mpcc
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_MPCC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$MPCC"; then
++  ac_cv_prog_MPCC="$MPCC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_MPCC="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++MPCC=$ac_cv_prog_MPCC
++if test -n "$MPCC"; then
++  echo "$as_me:$LINENO: result: $MPCC" >&5
++echo "${ECHO_T}$MPCC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$MPCC" && break
++done
++
++	for ac_prog in mpxlf
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_MPXLF+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$MPXLF"; then
++  ac_cv_prog_MPXLF="$MPXLF" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_MPXLF="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++MPXLF=$ac_cv_prog_MPXLF
++if test -n "$MPXLF"; then
++  echo "$as_me:$LINENO: result: $MPXLF" >&5
++echo "${ECHO_T}$MPXLF" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$MPXLF" && break
++done
++
++	if test -z "$MPCC" -o -z "$MPXLF" ; then
++	    { { echo "$as_me:$LINENO: error: Could not find IBM MPI compilation scripts.  Either mpcc or mpxlf is missing" >&5
++echo "$as_me: error: Could not find IBM MPI compilation scripts.  Either mpcc or mpxlf is missing" >&2;}
++   { (exit 1); exit 1; }; }
++	fi
+ 	TESTCC=${CC-xlC}; TESTF77=${F77-xlf}; CC=mpcc; F77=mpxlf
+ 	# There is no mpxlf90, but the options langlvl and free can
+ 	# select the F90 version of xlf
+@@ -2077,58 +3576,84 @@
+ 	;;
+ 
+ 	sgimpi)
+-	TESTCC=${CC:=cc}; TESTF77=${F77:=f77}; 
++	TESTCC=${CC:=cc}; TESTF77=${F77:=f77};
+ 	TESTCXX=${CXX:=CC}; TESTF90=${F90:=f90}
+-	echo $ac_n "checking for MPI_Init in -lmpi""... $ac_c" 1>&6
+-echo "configure:2084: checking for MPI_Init in -lmpi" >&5
+-ac_lib_var=`echo mpi'_'MPI_Init | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++
++echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
++echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
++if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_save_LIBS="$LIBS"
++  ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmpi  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 2092 "configure"
+-#include "confdefs.h"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
+ /* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
+ /* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char MPI_Init();
+-
+-int main() {
+-MPI_Init()
+-; return 0; }
+-EOF
+-if { (eval echo configure:2103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-    ac_tr_lib=HAVE_LIB`echo mpi | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+-  cat >> confdefs.h <<EOF
+-#define $ac_tr_lib 1
+-EOF
++   builtin and then its argument prototype would still apply.  */
++char MPI_Init ();
++int
++main ()
++{
++MPI_Init ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_mpi_MPI_Init=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_mpi_MPI_Init=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
++echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
++if test $ac_cv_lib_mpi_MPI_Init = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBMPI 1
++_ACEOF
+ 
+   LIBS="-lmpi $LIBS"
+ 
+-else
+-  echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	if test "$ac_cv_lib_mpi_MPI_Init" = "yes" ; then
+ 	    MPILIBNAME="mpi"
+-	fi	
++	fi
+ 	MPIRUN=mpirun
+ 	MPIBOOT=""
+ 	MPIUNBOOT=""
+@@ -2136,143 +3661,118 @@
+ 
+ 	*)
+ 	# Find the compilers
+-	
+ 
+-for ac_prog in cc xlC xlc pgcc icc gcc 
++
++for ac_prog in cc xlC xlc pgcc icc gcc
+ do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2147: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_CC="$ac_prog"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CC="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+ fi
+ fi
+-CC="$ac_cv_prog_CC"
++CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$ac_t""$CC" 1>&6
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$CC" && break
++  test -n "$CC" && break
+ done
+ 
+-test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:2178: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+-
+-ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-cat > conftest.$ac_ext << EOF
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable cc found in \$PATH" >&5
++echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
++   { (exit 1); exit 1; }; }
+ 
+-#line 2189 "configure"
+-#include "confdefs.h"
+-
+-main(){return(0);}
+-EOF
+-if { (eval echo configure:2194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  ac_cv_prog_cc_works=yes
+-  # If we can't run a trivial program, we are probably using a cross compiler.
+-  if (./conftest; exit) 2>/dev/null; then
+-    ac_cv_prog_cc_cross=no
+-  else
+-    ac_cv_prog_cc_cross=yes
+-  fi
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_prog_cc_works=no
+-fi
+-rm -fr conftest*
+-ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+-if test $ac_cv_prog_cc_works = no; then
+-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+-fi
+-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:2220: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+-cross_compiling=$ac_cv_prog_cc_cross
++echo "$as_me:$LINENO: checking whether the C compiler sets its return status correctly" >&5
++echo $ECHO_N "checking whether the C compiler sets its return status correctly... $ECHO_C" >&6
+ 
+-echo $ac_n "checking whether the C compiler sets its return status correctly""... $ac_c" 1>&6
+-echo "configure:2225: checking whether the C compiler sets its return status correctly" >&5
+ 
+ ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-cat > conftest.$ac_ext <<EOF
+-#line 2235 "configure"
+-#include "confdefs.h"
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-int main() {
++int
++main ()
++{
+ int a = bzzzt;
+-; return 0; }
+-EOF
+-if { (eval echo configure:2242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   notbroken=no
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  notbroken=yes
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++notbroken=yes
+ fi
+-rm -f conftest*
+-echo "$ac_t""$notbroken" 1>&6
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $notbroken" >&5
++echo "${ECHO_T}$notbroken" >&6
+ if test "$notbroken" = "no" ; then
+-    { echo "configure: error: installation or configuration problem: C compiler does not
+-correctly set error code when a fatal error occurs" 1>&2; exit 1; }
++    { { echo "$as_me:$LINENO: error: installation or configuration problem: C compiler does not
++correctly set error code when a fatal error occurs" >&5
++echo "$as_me: error: installation or configuration problem: C compiler does not
++correctly set error code when a fatal error occurs" >&2;}
++   { (exit 1); exit 1; }; }
+ fi
+ 
+-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:2259: checking whether we are using GNU C" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.c <<EOF
+-#ifdef __GNUC__
+-  yes;
+-#endif
+-EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+-  ac_cv_prog_gcc=yes
+-else
+-  ac_cv_prog_gcc=no
+-fi
+-fi
+ 
+-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+-if test "$ac_cv_prog_gcc" = yes; then
++if test "$ac_cv_c_compiler_gnu" = yes; then
+   GCC=yes
+ else
+   GCC=
+@@ -2281,274 +3781,470 @@
+ 	# We only look for the other compilers if there is no
+ 	# disable for them
+ 	if test "$enable_f77" != no -a "$enable_fortran" != no ; then
+-   	    if test -z "$F77"; then
+-  for ac_prog in g77 f77 f2c
+-do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2291: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++   	    ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$F77"; then
+   ac_cv_prog_F77="$F77" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_F77="$ac_prog"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+ fi
+ fi
+-F77="$ac_cv_prog_F77"
++F77=$ac_cv_prog_F77
+ if test -n "$F77"; then
+-  echo "$ac_t""$F77" 1>&6
++  echo "$as_me:$LINENO: result: $F77" >&5
++echo "${ECHO_T}$F77" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$F77" && break
++    test -n "$F77" && break
++  done
++fi
++if test -z "$F77"; then
++  ac_ct_F77=$F77
++  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_F77"; then
++  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_F77="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+ done
+ 
+-    test -z "$F77" && { echo "configure: error: no acceptable Fortran 77 compiler found in \$PATH" 1>&2; exit 1; }
++fi
++fi
++ac_ct_F77=$ac_cv_prog_ac_ct_F77
++if test -n "$ac_ct_F77"; then
++  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
++echo "${ECHO_T}$ac_ct_F77" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo $ac_n "checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:2324: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works" >&5
+-
+-ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++  test -n "$ac_ct_F77" && break
++done
+ 
+-cat > conftest.$ac_ext << EOF
++  F77=$ac_ct_F77
++fi
+ 
+-      program conftest
+-      end
+ 
+-EOF
+-if { (eval echo configure:2337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  ac_cv_prog_f77_works=yes
+-  # If we can't run a trivial program, we are probably using a cross compiler.
+-  if (./conftest; exit) 2>/dev/null; then
+-    ac_cv_prog_f77_cross=no
+-  else
+-    ac_cv_prog_f77_cross=yes
+-  fi
++# Provide some information about the compiler.
++echo "$as_me:3876:" \
++     "checking for Fortran 77 compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++rm -f a.out
++
++# If we don't use `.F' as extension, the preprocessor is not run on the
++# input file.  (Note that this only needs to work for GNU compilers.)
++ac_save_ext=$ac_ext
++ac_ext=F
++echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
++if test "${ac_cv_f77_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_prog_f77_works=no
+-fi
+-rm -fr conftest*
+-ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-echo "$ac_t""$ac_cv_prog_f77_works" 1>&6
+-if test $ac_cv_prog_f77_works = no; then
+-  { echo "configure: error: installation or configuration problem: Fortran 77 compiler cannot create executables." 1>&2; exit 1; }
+-fi
+-echo $ac_n "checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:2363: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "$ac_t""$ac_cv_prog_f77_cross" 1>&6
+-cross_compiling=$ac_cv_prog_f77_cross
+-
+-echo $ac_n "checking whether we are using GNU Fortran 77""... $ac_c" 1>&6
+-echo "configure:2368: checking whether we are using GNU Fortran 77" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_g77'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.fpp <<EOF
+-#ifdef __GNUC__
+-  yes
++  cat >conftest.$ac_ext <<_ACEOF
++      program main
++#ifndef __GNUC__
++       choke me
+ #endif
+-EOF
+-if { ac_try='$F77 -E conftest.fpp'; { (eval echo configure:2377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+-  ac_cv_prog_g77=yes
+-else
+-  ac_cv_prog_g77=no
+-fi
+-fi
+-
+-echo "$ac_t""$ac_cv_prog_g77" 1>&6
+ 
+-if test $ac_cv_prog_g77 = yes; then
+-  G77=yes
+-  ac_test_FFLAGS="${FFLAGS+set}"
+-  ac_save_FFLAGS="$FFLAGS"
+-  FFLAGS=
+-  echo $ac_n "checking whether $F77 accepts -g""... $ac_c" 1>&6
+-echo "configure:2392: checking whether $F77 accepts -g" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_f77_g'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_f77_compiler_gnu=$ac_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
++ac_ext=$ac_save_ext
++ac_test_FFLAGS=${FFLAGS+set}
++ac_save_FFLAGS=$FFLAGS
++FFLAGS=
++echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_f77_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat > conftest.f << EOF
+-       program conftest
+-       end
+-EOF
+-if test -z "`$F77 -g -c conftest.f 2>&1`"; then
++  FFLAGS=-g
++cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   ac_cv_prog_f77_g=yes
+ else
+-  ac_cv_prog_f77_g=no
+-fi
+-rm -f conftest*
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
++ac_cv_prog_f77_g=no
+ fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-echo "$ac_t""$ac_cv_prog_f77_g" 1>&6
+-  if test "$ac_test_FFLAGS" = set; then
+-    FFLAGS="$ac_save_FFLAGS"
+-  elif test $ac_cv_prog_f77_g = yes; then
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
++echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
++if test "$ac_test_FFLAGS" = set; then
++  FFLAGS=$ac_save_FFLAGS
++elif test $ac_cv_prog_f77_g = yes; then
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+     FFLAGS="-g -O2"
+   else
+-    FFLAGS="-O2"
++    FFLAGS="-g"
+   fi
+ else
+-  G77=
+-  test "${FFLAGS+set}" = set || FFLAGS="-g"
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++    FFLAGS="-O2"
++  else
++    FFLAGS=
++  fi
+ fi
+ 
++G77=`test $ac_compiler_gnu = yes && echo yes`
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
+         fi
+ 	if test "$enable_cxx" != no ; then
+-	    for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
+-do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2429: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++	    ac_ext=cc
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$CXX"; then
+   ac_cv_prog_CXX="$CXX" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_CXX="$ac_prog"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+ fi
+ fi
+-CXX="$ac_cv_prog_CXX"
++CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$ac_t""$CXX" 1>&6
++  echo "$as_me:$LINENO: result: $CXX" >&5
++echo "${ECHO_T}$CXX" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$CXX" && break
++    test -n "$CXX" && break
++  done
++fi
++if test -z "$CXX"; then
++  ac_ct_CXX=$CXX
++  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CXX"; then
++  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CXX="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+ done
+-test -n "$CXX" || CXX="gcc"
+ 
++fi
++fi
++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
++if test -n "$ac_ct_CXX"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
++echo "${ECHO_T}$ac_ct_CXX" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
+ 
+-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:2461: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++  test -n "$ac_ct_CXX" && break
++done
++test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
+ 
+-ac_ext=C
+-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cxx_cross
++  CXX=$ac_ct_CXX
++fi
+ 
+-cat > conftest.$ac_ext << EOF
+ 
+-#line 2472 "configure"
+-#include "confdefs.h"
++# Provide some information about the compiler.
++echo "$as_me:$LINENO:" \
++     "checking for C++ compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++
++echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
++if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-int main(){return(0);}
+-EOF
+-if { (eval echo configure:2477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  ac_cv_prog_cxx_works=yes
+-  # If we can't run a trivial program, we are probably using a cross compiler.
+-  if (./conftest; exit) 2>/dev/null; then
+-    ac_cv_prog_cxx_cross=no
+-  else
+-    ac_cv_prog_cxx_cross=yes
+-  fi
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_prog_cxx_works=no
+-fi
+-rm -fr conftest*
+-ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
+-if test $ac_cv_prog_cxx_works = no; then
+-  { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
+-fi
+-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:2503: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+-cross_compiling=$ac_cv_prog_cxx_cross
+-
+-echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+-echo "configure:2508: checking whether we are using GNU C++" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.C <<EOF
+-#ifdef __GNUC__
+-  yes;
++int
++main ()
++{
++#ifndef __GNUC__
++       choke me
+ #endif
+-EOF
+-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+-  ac_cv_prog_gxx=yes
+-else
+-  ac_cv_prog_gxx=no
+-fi
+-fi
+ 
+-echo "$ac_t""$ac_cv_prog_gxx" 1>&6
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
++GXX=`test $ac_compiler_gnu = yes && echo yes`
++ac_test_CXXFLAGS=${CXXFLAGS+set}
++ac_save_CXXFLAGS=$CXXFLAGS
++CXXFLAGS="-g"
++echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
++echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_cxx_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-if test $ac_cv_prog_gxx = yes; then
+-  GXX=yes
+-else
+-  GXX=
+-fi
++int
++main ()
++{
+ 
+-ac_test_CXXFLAGS="${CXXFLAGS+set}"
+-ac_save_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS=
+-echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-echo "configure:2536: checking whether ${CXX-g++} accepts -g" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  echo 'void f(){}' > conftest.cc
+-if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   ac_cv_prog_cxx_g=yes
+ else
+-  ac_cv_prog_cxx_g=no
+-fi
+-rm -f conftest*
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
++ac_cv_prog_cxx_g=no
+ fi
+-
+-echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+ if test "$ac_test_CXXFLAGS" = set; then
+-  CXXFLAGS="$ac_save_CXXFLAGS"
++  CXXFLAGS=$ac_save_CXXFLAGS
+ elif test $ac_cv_prog_cxx_g = yes; then
+   if test "$GXX" = yes; then
+     CXXFLAGS="-g -O2"
+@@ -2562,143 +4258,418 @@
+     CXXFLAGS=
+   fi
+ fi
++for ac_declaration in \
++   '' \
++   'extern "C" void std::exit (int) throw (); using std::exit;' \
++   'extern "C" void std::exit (int); using std::exit;' \
++   'extern "C" void exit (int) throw ();' \
++   'extern "C" void exit (int);' \
++   'void exit (int);'
++do
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++#include <stdlib.h>
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++continue
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++rm -f conftest*
++if test -n "$ac_declaration"; then
++  echo '#ifdef __cplusplus' >>confdefs.h
++  echo $ac_declaration      >>confdefs.h
++  echo '#endif'             >>confdefs.h
++fi
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 	fi
+ 	if test "$enable_f90" != no ; then
+-	    
+-if test -z "$F90" ; then
+-    for ac_prog in f90 xlf90 pgf90 ifort epcf90 f95 fort xlf95 lf95 pathf90 g95 fc ifc efc
+-do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2576: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_F90'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++	    # This is the fortran90 version of f90 language support
++ac_ext=${ac_f90ext-f}
++ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
++ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f90_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in f90 xlf90 pgf90 ifort epcf90 f95 fort xlf95 lf95 pathf90 g95 gfortran ifc efc
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_F90+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$F90"; then
+   ac_cv_prog_F90="$F90" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_F90="$ac_prog"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_F90="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+ fi
+ fi
+-F90="$ac_cv_prog_F90"
++F90=$ac_cv_prog_F90
+ if test -n "$F90"; then
+-  echo "$ac_t""$F90" 1>&6
++  echo "$as_me:$LINENO: result: $F90" >&5
++echo "${ECHO_T}$F90" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$F90" && break
++    test -n "$F90" && break
++  done
++fi
++if test -z "$F90"; then
++  ac_ct_F90=$F90
++  for ac_prog in f90 xlf90 pgf90 ifort epcf90 f95 fort xlf95 lf95 pathf90 g95 gfortran ifc efc
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_F90+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_F90"; then
++  ac_cv_prog_ac_ct_F90="$ac_ct_F90" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_F90="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+ done
+ 
+-    test -z "$F90" && echo "configure: warning: no acceptable Fortran 90 compiler found in \$PATH" 1>&2
+ fi
+-if test -n "$F90" ; then
+-     echo $ac_n "checking for extension for Fortran 90 programs""... $ac_c" 1>&6
+-echo "configure:2609: checking for extension for Fortran 90 programs" >&5
+-pac_cv_f90_ext="f90"
+-cat > conftest.$pac_cv_f90_ext <<EOF
++fi
++ac_ct_F90=$ac_cv_prog_ac_ct_F90
++if test -n "$ac_ct_F90"; then
++  echo "$as_me:$LINENO: result: $ac_ct_F90" >&5
++echo "${ECHO_T}$ac_ct_F90" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$ac_ct_F90" && break
++done
++
++  F90=$ac_ct_F90
++fi
++
++
++# once we find the compiler, confirm the extension
++echo "$as_me:$LINENO: checking that $ac_ext works as the extension for Fortran 90 program" >&5
++echo $ECHO_N "checking that $ac_ext works as the extension for Fortran 90 program... $ECHO_C" >&6
++cat > conftest.$ac_ext <<EOF
+       program conftest
+       end
+ EOF
+-ac_compile='${F90-f90} -c $F90FLAGS conftest.$pac_cv_f90_ext 1>&5'
+-if { (eval echo configure:2616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } ; then
+-    echo "$ac_t""f90" 1>&6
+-else
+-    rm -f conftest*
+-    pac_cv_f90_ext="f"
+-    cat > conftest.$pac_cv_f90_ext <<EOF
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } ; then
++    echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++    echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    echo "$as_me:$LINENO: checking for extension for Fortran 90 programs" >&5
++echo $ECHO_N "checking for extension for Fortran 90 programs... $ECHO_C" >&6
++    ac_ext="f90"
++    cat > conftest.$ac_ext <<EOF
+       program conftest
+       end
+ EOF
+-    if { (eval echo configure:2625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } ; then
+-	echo "$ac_t""f" 1>&6
++    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } ; then
++        echo "$as_me:$LINENO: result: f90" >&5
++echo "${ECHO_T}f90" >&6
+     else
+-        echo "$ac_t""unknown!" 1>&6
+-    fi
+-fi
+-echo $ac_n "checking whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:2632: checking whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) works" >&5
+-
+-# We cannot use _LANG_FORTRAN90 here because we will usually be executing this
+-# test in the context of _PROG_F90, which is a require on _LANG_FORTRAN90.
+-# Instead, we insert the necessary code from _LANG_FORTRAN90 here
+-ac_ext=$pac_cv_f90_ext
+-ac_compile='${F90-f90} -c $F90FLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F90-f90} -o conftest${ac_exeext} $F90FLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$pac_cv_prog_f90_cross
+-# Include a Fortran 90 construction to distinguish between Fortran 77 
+-# and Fortran 90 compilers.
+-cat >conftest.$ac_ext <<EOF
++        rm -f conftest*
++        ac_ext="f"
++        cat > conftest.$ac_ext <<EOF
+       program conftest
+-      integer, dimension(10) :: n
+       end
+ EOF
+-if { (eval echo configure:2648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeect} ; then
+-    pac_cv_prog_f90_works="yes"
+-    if (./conftest; exit) 2>/dev/null ; then
+-        pac_cv_prog_f90_cross="no"
++        if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } ; then
++            echo "$as_me:$LINENO: result: f" >&5
++echo "${ECHO_T}f" >&6
++        else
++            echo "$as_me:$LINENO: result: unknown!" >&5
++echo "${ECHO_T}unknown!" >&6
++        fi
++    fi
++    ac_f90ext=$ac_ext
++    if test "$ac_ext" = "f90" ; then
++        pac_cv_f90_ext_f90=yes
+     else
+-        pac_cv_prog_f90_cross="yes"
++        pac_cv_f90_ext_f90=no
+     fi
++    pac_cv_f90_ext=$ac_ext
++    rm -f conftest*
++fi
++# Provide some information about the compiler.
++echo "$as_me:4525:" \
++     "checking for Fortran 90 compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++
++# If we don't use `.F' as extension, the preprocessor is not run on the
++# input file.
++if test -n "$F90" ; then
++    ac_save_ext=$ac_ext
++    ac_ext=F
++    echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 90 compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU Fortran 90 compiler... $ECHO_C" >&6
++if test "${ac_cv_f90_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  pac_cv_prog_f90_works="no"
++  cat >conftest.$ac_ext <<_ACEOF
++      program main
++#ifndef __GNUC__
++       choke me
++#endif
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f90_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_f90_compiler_gnu=$ac_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_f90_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_f90_compiler_gnu" >&6
++    ac_ext=$ac_save_ext
++    G90=`test $ac_compiler_gnu = yes && echo yes`
++    ac_test_F90FLAGS=${F90FLAGS+set}
++ac_save_F90FLAGS=$F90FLAGS
++F90FLAGS=
++echo "$as_me:$LINENO: checking whether $F90 accepts -g" >&5
++echo $ECHO_N "checking whether $F90 accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_f90_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  F90FLAGS=-g
++cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f90_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_f90_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_prog_f90_g=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_f90_g" >&5
++echo "${ECHO_T}$ac_cv_prog_f90_g" >&6
++if test "$ac_test_F90FLAGS" = set; then
++  F90FLAGS=$ac_save_F90FLAGS
++elif test $ac_cv_prog_f90_g = yes; then
++  if test "$G90" = yes; then
++    F90FLAGS="-g -O2"
++  else
++    F90FLAGS="-g"
++  fi
++else
++  if test "$G90" = yes; then
++    F90FLAGS="-O2"
++  else
++    F90FLAGS=
++  fi
++fi
+ fi
+-rm -f conftest*
+-# The intel compiler sometimes generates these work.pc and .pcl files
+-rm -f work.pc work.pcl
+ ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-echo "$ac_t""$pac_cv_prog_f90_works" 1>&6
+-if test $pac_cv_prog_f90_works = no; then
+-  echo "configure: warning: installation or configuration problem: Fortran 90 compiler cannot create executables." 1>&2
+-fi
+-echo $ac_n "checking whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:2675: checking whether the Fortran 90 compiler ($F90 $F90FLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "$ac_t""$pac_cv_prog_f90_cross" 1>&6
+-cross_compiling=$pac_cv_prog_f90_cross
+-
+-fi
+-ac_f90ext=$pac_cv_f90_ext
+-ac_f90compile='${F90-f90} -c $F90FLAGS conftest.$ac_f90ext 1>&5'
+-ac_f90link='${F90-f90} -o conftest${ac_exeext} $F90FLAGS $LDFLAGS conftest.$ac_f90ext $LIBS 1>&5'
+-# Check for problems with Intel efc compiler, if the compiler works
+-if test "$pac_cv_prog_f90_works" = yes ; then
+-    cat > conftest.$ac_f90ext <<EOF
+-        program main
+-        end
+-EOF
+-    pac_msg=`$F90 -o conftest $F90FLAGS $LDFLAGS conftest.$ac_f90ext $LIBS 2>&1 | grep 'bfd assertion fail'`
+-    if test -n "$pac_msg" ; then
+-        pac_msg=`$F90 -o conftest $F90FLAGS $LDFLAGS conftest.$ac_f90ext -i_dynamic $LIBS 2>&1 | grep 'bfd assertion fail'`
+-        if test -z "$pac_msg" ; then LDFLAGS="-i_dynamic" ; fi
+-        # There should really be f90linker flags rather than generic ldflags.
+-    fi
+-fi
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 	fi
+ 	# Set defaults for the TEST versions if not already set
+-	if test -z "$TESTCC" ; then 
++	if test -z "$TESTCC" ; then
+ 	    TESTCC=${CC:=cc}
+         fi
+-	if test -z "$TESTF77" ; then 
++	if test -z "$TESTF77" ; then
+   	    TESTF77=${F77:=f77}
+         fi
+ 	if test -z "$TESTCXX" ; then
+@@ -2716,47 +4687,53 @@
+ if test "X$MAKE" = "X" ; then
+    for ac_prog in make gnumake nmake pmake smake
+ do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2723: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_MAKE+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$MAKE"; then
+   ac_cv_prog_MAKE="$MAKE" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_MAKE="$ac_prog"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_MAKE="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+ fi
+ fi
+-MAKE="$ac_cv_prog_MAKE"
++MAKE=$ac_cv_prog_MAKE
+ if test -n "$MAKE"; then
+-  echo "$ac_t""$MAKE" 1>&6
++  echo "$as_me:$LINENO: result: $MAKE" >&5
++echo "${ECHO_T}$MAKE" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$MAKE" && break
++  test -n "$MAKE" && break
+ done
+ 
+ fi
+ 
+ 
+-echo $ac_n "checking whether clock skew breaks make""... $ac_c" 1>&6
+-echo "configure:2756: checking whether clock skew breaks make" >&5
+-if eval "test \"`echo '$''{'pac_cv_prog_make_found_clock_skew'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking whether clock skew breaks make" >&5
++echo $ECHO_N "checking whether clock skew breaks make... $ECHO_C" >&6
++if test "${pac_cv_prog_make_found_clock_skew+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+ 
+ rm -f conftest*
+ cat > conftest <<EOF
+@@ -2772,20 +4749,22 @@
+ rm -f conftest*
+ 
+ fi
+-
+-echo "$ac_t""$pac_cv_prog_make_found_clock_skew" 1>&6
++echo "$as_me:$LINENO: result: $pac_cv_prog_make_found_clock_skew" >&5
++echo "${ECHO_T}$pac_cv_prog_make_found_clock_skew" >&6
+ if test "$pac_cv_prog_make_found_clock_skew" = "yes" ; then
+-    echo "configure: warning: Clock skew found by make.  The configure and build may fail.
+-Consider building in a local instead of NFS filesystem." 1>&2
++    { echo "$as_me:$LINENO: WARNING: Clock skew found by make.  The configure and build may fail.
++Consider building in a local instead of NFS filesystem." >&5
++echo "$as_me: WARNING: Clock skew found by make.  The configure and build may fail.
++Consider building in a local instead of NFS filesystem." >&2;}
+ fi
+ 
+ 
+-echo $ac_n "checking whether make supports include""... $ac_c" 1>&6
+-echo "configure:2785: checking whether make supports include" >&5
+-if eval "test \"`echo '$''{'pac_cv_prog_make_include'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking whether make supports include" >&5
++echo $ECHO_N "checking whether make supports include... $ECHO_C" >&6
++if test "${pac_cv_prog_make_include+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+ 
+ rm -f conftest
+ cat > conftest <<.
+@@ -2804,8 +4783,8 @@
+ fi
+ 
+ fi
+-
+-echo "$ac_t""$pac_cv_prog_make_include" 1>&6
++echo "$as_me:$LINENO: result: $pac_cv_prog_make_include" >&5
++echo "${ECHO_T}$pac_cv_prog_make_include" >&6
+ if test "$pac_cv_prog_make_include" = "no" ; then
+     :
+ else
+@@ -2813,12 +4792,12 @@
+ fi
+ 
+ 
+-echo $ac_n "checking whether make allows comments in actions""... $ac_c" 1>&6
+-echo "configure:2818: checking whether make allows comments in actions" >&5
+-if eval "test \"`echo '$''{'pac_cv_prog_make_allows_comments'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking whether make allows comments in actions" >&5
++echo $ECHO_N "checking whether make allows comments in actions... $ECHO_C" >&6
++if test "${pac_cv_prog_make_allows_comments+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+ 
+ rm -f conftest
+ cat > conftest <<.
+@@ -2828,7 +4807,7 @@
+ 	@echo "success"
+ .
+ pac_str=`$MAKE -f conftest 2>&1`
+-rm -f conftest 
++rm -f conftest
+ if test "$pac_str" != "success" ; then
+     pac_cv_prog_make_allows_comments="no"
+ else
+@@ -2836,23 +4815,26 @@
+ fi
+ 
+ fi
+-
+-echo "$ac_t""$pac_cv_prog_make_allows_comments" 1>&6
++echo "$as_me:$LINENO: result: $pac_cv_prog_make_allows_comments" >&5
++echo "${ECHO_T}$pac_cv_prog_make_allows_comments" >&6
+ if test "$pac_cv_prog_make_allows_comments" = "no" ; then
+-    echo "configure: warning: Your make does not allow comments in target code.
++    { echo "$as_me:$LINENO: WARNING: Your make does not allow comments in target code.
++Using this make may cause problems when building programs.
++You should consider using gnumake instead." >&5
++echo "$as_me: WARNING: Your make does not allow comments in target code.
+ Using this make may cause problems when building programs.
+-You should consider using gnumake instead." 1>&2
+-    
++You should consider using gnumake instead." >&2;}
++
+ fi
+ 
+ 
+ 
+-echo $ac_n "checking for virtual path format""... $ac_c" 1>&6
+-echo "configure:2852: checking for virtual path format" >&5
+-if eval "test \"`echo '$''{'pac_cv_prog_make_vpath'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for virtual path format" >&5
++echo $ECHO_N "checking for virtual path format... $ECHO_C" >&6
++if test "${pac_cv_prog_make_vpath+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+ 
+ rm -rf conftest*
+ mkdir conftestdir
+@@ -2866,7 +4848,7 @@
+ 	@echo \$<
+ EOF
+ ac_out=`$MAKE -f conftest 2>&1 | grep 'conftestdir/a.c'`
+-if test -n "$ac_out" ; then 
++if test -n "$ac_out" ; then
+     pac_cv_prog_make_vpath="VPATH"
+ else
+     rm -f conftest
+@@ -2877,7 +4859,7 @@
+ 	@echo \$<
+ EOF
+     ac_out=`$MAKE -f conftest 2>&1 | grep 'conftestdir/a.c'`
+-    if test -n "$ac_out" ; then 
++    if test -n "$ac_out" ; then
+         pac_cv_prog_make_vpath=".PATH"
+     else
+ 	pac_cv_prog_make_vpath="neither VPATH nor .PATH works"
+@@ -2886,8 +4868,8 @@
+ rm -rf conftest*
+ 
+ fi
+-
+-echo "$ac_t""$pac_cv_prog_make_vpath" 1>&6
++echo "$as_me:$LINENO: result: $pac_cv_prog_make_vpath" >&5
++echo "${ECHO_T}$pac_cv_prog_make_vpath" >&6
+ if test "$pac_cv_prog_make_vpath" = "VPATH" ; then
+     VPATH='VPATH=.:${srcdir}'
+ elif test "$pac_cv_prog_make_vpath" = ".PATH" ; then
+@@ -2896,12 +4878,12 @@
+ 
+ 
+ 
+-echo $ac_n "checking whether make sets CFLAGS""... $ac_c" 1>&6
+-echo "configure:2901: checking whether make sets CFLAGS" >&5
+-if eval "test \"`echo '$''{'pac_cv_prog_make_set_cflags'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking whether make sets CFLAGS" >&5
++echo $ECHO_N "checking whether make sets CFLAGS... $ECHO_C" >&6
++if test "${pac_cv_prog_make_set_cflags+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+ 
+ rm -f conftest
+ cat > conftest <<EOF
+@@ -2910,7 +4892,7 @@
+ 	@echo X\${CFLAGS}X
+ EOF
+ pac_str=`$MAKE -f conftest 2>&1`
+-rm -f conftest 
++rm -f conftest
+ if test "$pac_str" = "XX" ; then
+     pac_cv_prog_make_set_cflags="no"
+ else
+@@ -2918,8 +4900,8 @@
+ fi
+ 
+ fi
+-
+-echo "$ac_t""$pac_cv_prog_make_set_cflags" 1>&6
++echo "$as_me:$LINENO: result: $pac_cv_prog_make_set_cflags" >&5
++echo "${ECHO_T}$pac_cv_prog_make_set_cflags" >&6
+ if test "$pac_cv_prog_make_set_cflags" = "no" ; then
+     :
+ else
+@@ -2927,30 +4909,32 @@
+ fi
+ 
+ if test "$pac_cv_prog_make_echos_dir" = "no" ; then
+-    echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-echo "configure:2932: checking whether ${MAKE-make} sets \${MAKE}" >&5
+-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++    echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat > conftestmake <<\EOF
++  cat >conftest.make <<\_ACEOF
+ all:
+-	@echo 'ac_maketemp="${MAKE}"'
+-EOF
++	@echo 'ac_maketemp="$(MAKE)"'
++_ACEOF
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
++eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+ if test -n "$ac_maketemp"; then
+   eval ac_cv_prog_make_${ac_make}_set=yes
+ else
+   eval ac_cv_prog_make_${ac_make}_set=no
+ fi
+-rm -f conftestmake
++rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+@@ -2969,34 +4953,84 @@
+ 
+ # We need ranlib as well
+ if test -z "$RANLIB" ; then
+-    # Extract the first word of "ranlib", so it can be a program name with args.
+-set dummy ranlib; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2976: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++    if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_RANLIB+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$RANLIB"; then
+   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_RANLIB="ranlib"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+ fi
+ fi
+-RANLIB="$ac_cv_prog_RANLIB"
++RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$ac_t""$RANLIB" 1>&6
++  echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_RANLIB"; then
++  ac_ct_RANLIB=$RANLIB
++  # Extract the first word of "ranlib", so it can be a program name with args.
++set dummy ranlib; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_RANLIB"; then
++  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+ else
+-  echo "$ac_t""no" 1>&6
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_RANLIB="ranlib"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
++fi
++fi
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  RANLIB=$ac_ct_RANLIB
++else
++  RANLIB="$ac_cv_prog_RANLIB"
+ fi
+ 
+ fi
+@@ -3008,166 +5042,371 @@
+ fi
+ 
+ if test "$pac_lib_mpi_is_building" = "yes" ; then
+-    cat >> confdefs.h <<\EOF
++
++cat >>confdefs.h <<\_ACEOF
+ #define HAVE_MPI_F2C 1
+-EOF
++_ACEOF
+ 
+ else
+-    
+-echo $ac_n "checking for MPI F2C and C2F routines""... $ac_c" 1>&6
+-echo "configure:3019: checking for MPI F2C and C2F routines" >&5
+-if eval "test \"`echo '$''{'pac_cv_mpi_f2c'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++
++echo "$as_me:$LINENO: checking for MPI F2C and C2F routines" >&5
++echo $ECHO_N "checking for MPI F2C and C2F routines... $ECHO_C" >&6
++if test "${pac_cv_mpi_f2c+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
+-cat > conftest.$ac_ext <<EOF
+-#line 3025 "configure"
+-#include "confdefs.h"
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include "mpi.h"
+-int main() {
++int
++main ()
++{
+ MPI_Request request;MPI_Fint a;a = MPI_Request_c2f(request);
+-; return 0; }
+-EOF
+-if { (eval echo configure:3032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   pac_cv_mpi_f2c="yes"
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  pac_cv_mpi_f2c="no"
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++pac_cv_mpi_f2c="no"
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
++echo "$as_me:$LINENO: result: $pac_cv_mpi_f2c" >&5
++echo "${ECHO_T}$pac_cv_mpi_f2c" >&6
++if test "$pac_cv_mpi_f2c" = "yes" ; then
+ 
+-echo "$ac_t""$pac_cv_mpi_f2c" 1>&6
+-if test "$pac_cv_mpi_f2c" = "yes" ; then 
+-    cat >> confdefs.h <<\EOF
++cat >>confdefs.h <<\_ACEOF
+ #define HAVE_MPI_F2C 1
+-EOF
+- 
++_ACEOF
++
+ fi
+ 
+ 
+     # Check for mpi.h
+-    echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:3056: checking how to run the C preprocessor" >&5
++    ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++  if test "${ac_cv_prog_CPP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-    # This must be in double quotes, not single quotes, because CPP may get
+-  # substituted into the Makefile and "${CC-cc}" will confuse make.
+-  CPP="${CC-cc} -E"
++      # Double quotes because CPP needs to be expanded
++    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp.
+-  cat > conftest.$ac_ext <<EOF
+-#line 3071 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+-if test -z "$ac_err"; then
+-  :
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP="${CC-cc} -E -traditional-cpp"
+-  cat > conftest.$ac_ext <<EOF
+-#line 3088 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+-if test -z "$ac_err"; then
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
+   :
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP="${CC-cc} -nologo -E"
+-  cat > conftest.$ac_ext <<EOF
+-#line 3105 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+-if test -z "$ac_err"; then
+-  :
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP=/lib/cpp
++  ac_cpp_err=yes
+ fi
+-rm -f conftest*
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  break
+ fi
+-rm -f conftest*
+-  ac_cv_prog_CPP="$CPP"
++
++    done
++    ac_cv_prog_CPP=$CPP
++
++fi
++  CPP=$ac_cv_prog_CPP
++else
++  ac_cv_prog_CPP=$CPP
++fi
++echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6
++ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
+ fi
+-  CPP="$ac_cv_prog_CPP"
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
+ else
+-  ac_cv_prog_CPP="$CPP"
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  :
++else
++  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
+ fi
+-echo "$ac_t""$CPP" 1>&6
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
+ 
+ ac_safe=`echo "mpi.h" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for mpi.h""... $ac_c" 1>&6
+-echo "configure:3137: checking for mpi.h" >&5
+-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for mpi.h" >&5
++echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6
++if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+ pac_found_header=no
+ if test "$CPP" != "/lib/cpp" ; then
+-    cat > conftest.$ac_ext <<EOF
+-#line 3145 "configure"
+-#include "confdefs.h"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <mpi.h>
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+-if test -z "$ac_err"; then
+-  rm -rf conftest*
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
+   pac_found_header=yes
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_ext
+ fi
+ # If cpp failed, see if the compiler accepts the header.
+ if test "$pac_found_header" != "yes" ; then
+     cat >conftest.c<<EOF
+-#line 3165 "configure"
++#line 5399 "configure"
+ #include "confdefs.h"
+ #include <mpi.h>
+ int conftest() {return 0;}
+ EOF
+     ac_compile_for_cpp='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
+-    if { (eval echo configure:3171: \"$ac_compile_for_cpp\") 1>&5; (eval $ac_compile_for_cpp) 2>&5; }; then
++    if { (eval echo "$as_me:$LINENO: \"$ac_compile_for_cpp\"") >&5
++  (eval $ac_compile_for_cpp) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
+ 	pac_found_header=yes
+     else
+         echo "configure: failed program was:" >&5
+@@ -3184,12 +5423,16 @@
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+   :
+ else
+-  echo "$ac_t""no" 1>&6
+-{ echo "configure: error: mpi.h is required" 1>&2; exit 1; }
+-    
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++{ { echo "$as_me:$LINENO: error: mpi.h is required" >&5
++echo "$as_me: error: mpi.h is required" >&2;}
++   { (exit 1); exit 1; }; }
++
+ fi
+ 
+ fi
+@@ -3197,30 +5440,30 @@
+ #
+ # The following variables are used in mpif77.in and reflect the MPI
+ # implementation that is in use.
+-# 
++#
+ if test "$pac_lib_mpi_is_building" = "yes" ; then
+     # These values are EXPORTED by the MPICH configure
+     # Alternately, if we are building a *new* Fortran library for a
+     # pre-existing MPICH build, we need to get these variables from
+     # the MPICH library configuration file.
+-    
+-    
+-    
+-    
++
++
++
++
+     F77_LDFLAGS="$ROMIO_LFLAGS"
+-    
++
+     BASE_FFLAGS="$ROMIO_TFFLAGS"
+-    
+-    
+-    
++
++
++
+     # Shared library support (replace with libtool?)
+-    
+-    
+-    
+-    
+-    
++
++
++
++
++
+     MPI2_OBJECTS='${MPI2_OBJECTS}'
+-    
++
+ fi
+ if test "$DEBUG_DUMP" = "yes" ; then
+     rm -f config.env
+@@ -3239,164 +5482,334 @@
+     pac_save_prog_cxx_cross="$ac_cv_prog_cxx_cross"
+     pac_save_prog_f90_cross="$pac_cv_prog_f90_cross"
+     if test "X$CPP" = "X" ; then
+-	echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:3244: checking how to run the C preprocessor" >&5
++	ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++  if test "${ac_cv_prog_CPP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-    # This must be in double quotes, not single quotes, because CPP may get
+-  # substituted into the Makefile and "${CC-cc}" will confuse make.
+-  CPP="${CC-cc} -E"
++      # Double quotes because CPP needs to be expanded
++    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp.
+-  cat > conftest.$ac_ext <<EOF
+-#line 3259 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+-if test -z "$ac_err"; then
+-  :
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP="${CC-cc} -E -traditional-cpp"
+-  cat > conftest.$ac_ext <<EOF
+-#line 3276 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3282: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+-if test -z "$ac_err"; then
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
+   :
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP="${CC-cc} -nologo -E"
+-  cat > conftest.$ac_ext <<EOF
+-#line 3293 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+-if test -z "$ac_err"; then
+-  :
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP=/lib/cpp
++  ac_cpp_err=yes
+ fi
+-rm -f conftest*
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  break
+ fi
+-rm -f conftest*
+-  ac_cv_prog_CPP="$CPP"
++
++    done
++    ac_cv_prog_CPP=$CPP
++
+ fi
+-  CPP="$ac_cv_prog_CPP"
++  CPP=$ac_cv_prog_CPP
+ else
+-  ac_cv_prog_CPP="$CPP"
++  ac_cv_prog_CPP=$CPP
+ fi
+-echo "$ac_t""$CPP" 1>&6
+-
+-    fi
+-    pac_save_CPP="$CPP"
+-    CC="${TESTCC:=$CC}"
+-    CXX="${TESTCXX:=$CXX}"
+-    F77="${TESTF77:=$F77}"
+-    F90="${TESTF90:=$F90}"
+-    if test -z "$TESTCPP" ; then
+-        
+-if test -z "$TESTCPP"; then
+-  if eval "test \"`echo '$''{'pac_cv_prog_TESTCPP'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  
+-  rm -f conftest.*
+-  cat > conftest.c <<EOF
+-  #include <assert.h>
+-  Syntax Error
+-EOF
++echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6
++ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp.
+-  TESTCPP="${TESTCC-cc} -E"
+-  ac_try="$TESTCPP conftest.c >/dev/null 2>conftest.out"
+-  if { (eval echo configure:3345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ; then
+-      pac_cv_prog_TESTCPP="$TESTCPP"
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
+   fi
+-  if test "X$pac_cv_prog_TESTCPP" = "X" ; then
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  :
++else
++  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++    fi
++    pac_save_CPP="$CPP"
++    CC="${TESTCC:=$CC}"
++    CXX="${TESTCXX:=$CXX}"
++    F77="${TESTF77:=$F77}"
++    F90="${TESTF90:=$F90}"
++    if test -z "$TESTCPP" ; then
++
++if test -z "$TESTCPP"; then
++  if test "${pac_cv_prog_TESTCPP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++  rm -f conftest.*
++  cat > conftest.c <<EOF
++  #include <assert.h>
++  Syntax Error
++EOF
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp.
++  TESTCPP="${TESTCC-cc} -E"
++  ac_try="$TESTCPP conftest.c >/dev/null 2>conftest.out"
++  if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } ; then
++      pac_cv_prog_TESTCPP="$TESTCPP"
++  fi
++  if test "X$pac_cv_prog_TESTCPP" = "X" ; then
+       TESTCPP="${TESTCC-cc} -E -traditional-cpp"
+       ac_try="$TESTCPP conftest.c >/dev/null 2>conftest.out"
+-      if { (eval echo configure:3351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ; then
++      if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } ; then
+           pac_cv_prog_TESTCPP="$TESTCPP"
+       fi
+   fi
+   if test "X$pac_cv_prog_TESTCPP" = "X" ; then
+       TESTCPP="${TESTCC-cc} -nologo -E"
+       ac_try="$TESTCPP conftest.c >/dev/null 2>conftest.out"
+-      if { (eval echo configure:3358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ; then
++      if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } ; then
+           pac_cv_prog_TESTCPP="$TESTCPP"
+       fi
+   fi
+   if test "X$pac_cv_prog_TESTCPP" = "X" ; then
+       # Extract the first word of "cpp", so it can be a program name with args.
+ set dummy cpp; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3366: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_TESTCPP'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_TESTCPP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case "$TESTCPP" in
+-  /*)
++  case $TESTCPP in
++  [\\/]* | ?:[\\/]*)
+   ac_cv_path_TESTCPP="$TESTCPP" # Let the user override the test with a path.
+   ;;
+-  ?:/*)			 
+-  ac_cv_path_TESTCPP="$TESTCPP" # Let the user override the test with a dos path.
+-  ;;
+   *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do 
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_TESTCPP="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_TESTCPP="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+   ;;
+ esac
+ fi
+-TESTCPP="$ac_cv_path_TESTCPP"
++TESTCPP=$ac_cv_path_TESTCPP
++
+ if test -n "$TESTCPP"; then
+-  echo "$ac_t""$TESTCPP" 1>&6
++  echo "$as_me:$LINENO: result: $TESTCPP" >&5
++echo "${ECHO_T}$TESTCPP" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+   fi
+   rm -f conftest.*
+-  
++
+ fi
+ 
+ else
+@@ -3408,26 +5821,30 @@
+     pac_save_level="0"
+     # Recompute cross_compiling values and set for the current language
+     # This is just:
+-    
++
++
+     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+     if test "$pac_cross_compiling" = "yes" ; then
+         ac_cv_prog_cc_cross=yes
+ 	ac_cv_prog_cc_works=yes
+     else
+-        cat > conftest.$ac_ext << EOF
++        cat > conftest.$ac_ext <<EOF
+ 
+-#line 3426 "configure"
++#line 5838 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:3431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -3443,31 +5860,35 @@
+ rm -fr conftest*
+     fi
+     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+     # Ignore Fortran if we aren't using it.
+     if test -n "$F77" ; then
+-        
++
++
+         ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+ 	if test "$pac_cross_compiling" = "yes" ; then
+ 	    ac_cv_prog_f77_cross=yes
+ 	    ac_cv_prog_f77_works=yes
+ 	else
+-            cat > conftest.$ac_ext << EOF
++            cat > conftest.$ac_ext <<EOF
+ 
+       program conftest
+       end
+ 
+ EOF
+-if { (eval echo configure:3471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_f77_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -3483,31 +5904,34 @@
+ rm -fr conftest*
+ 	fi
+         ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+     fi
+     # Ignore C++ if we aren't using it.
+     if test -n "$CXX" ; then
+-        
+-        ac_ext=C
+-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++
++
++        ac_ext=cc
+ ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cxx_cross
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+-        cat > conftest.$ac_ext << EOF
++        cat > conftest.$ac_ext <<EOF
+ 
+-#line 3506 "configure"
++#line 5925 "configure"
+ #include "confdefs.h"
+ 
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:3511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cxx_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -3522,21 +5946,20 @@
+ fi
+ rm -fr conftest*
+         ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+     fi
+     # Ignore Fortran 90 if we aren't using it.
+     if test -n "$F90" ; then
+-        
+-        
+-ac_ext=$pac_cv_f90_ext
+-ac_compile='${F90-f90} -c $F90FLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F90-f90} -o conftest${ac_exeext} $F90FLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$pac_cv_prog_f90_cross
++
++
++        ac_ext=${ac_f90ext-f}
++ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
++ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f90_compiler_gnu
+ 
+ 	        	if test "$pac_cross_compiling" = "yes" ; then
+ 	    ac_cv_prog_f90_cross=yes
+@@ -3564,11 +5987,10 @@
+ 	pac_cv_prog_f90_works="$ac_cv_prog_f90_works"
+         rm -fr conftest*
+         ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+     fi
+ fi
+@@ -3585,26 +6007,27 @@
+     NOG2C=no
+ fi
+ if test "$pac_lib_mpi_is_building" = "yes" ; then
+-        
++
+ found_cached="yes"
+-echo $ac_n "checking for routines to access the command line from Fortran 77""... $ac_c" 1>&6
+-echo "configure:3592: checking for routines to access the command line from Fortran 77" >&5
+-if eval "test \"`echo '$''{'pac_cv_prog_f77_cmdarg'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for routines to access the command line from Fortran 77" >&5
++echo $ECHO_N "checking for routines to access the command line from Fortran 77... $ECHO_C" >&6
++if test "${pac_cv_prog_f77_cmdarg+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
+-    echo "$ac_t""searching..." 1>&6
++
++    echo "$as_me:$LINENO: result: searching..." >&5
++echo "${ECHO_T}searching..." >&6
+     found_cached="no"
+     # First, we perform a quick check.  Does iargc and getarg work?
+     fxx_module="${FXX_MODULE:-}"
+     f77_getargdecl="${F77_GETARGDECL:-external getarg}"
+     f77_getarg="${F77_GETARG:-call GETARG(i,s)}"
+     f77_iargc="${F77_IARGC:-IARGC()}"
+-    #    
++    #
+     # Grumble.  The Absoft Fortran compiler computes i - i as 0 and then
+     # 1.0 / 0 at compile time, even though the code may never be executed.
+     # What we need is a way to generate an error, so the second usage of i
+-    # was replaced with f77_iargc.  
++    # was replaced with f77_iargc.
+     cat > conftest.f <<EOF
+         program main
+ $fxx_module
+@@ -3624,9 +6047,13 @@
+     if test -z "$ac_fcompilelink" ; then
+         ac_fcompilelink="${F77-f77} -o conftest $FFLAGS $flags conftest.f $LDFLAGS $LIBS 1>&5"
+     fi
+-    echo $ac_n "checking whether ${F77-f77} $flags $libs works with GETARG and IARGC""... $ac_c" 1>&6
+-echo "configure:3629: checking whether ${F77-f77} $flags $libs works with GETARG and IARGC" >&5
+-    if { (eval echo configure:3630: \"$ac_fcompilelink\") 1>&5; (eval $ac_fcompilelink) 2>&5; } && test -x conftest ; then
++    echo "$as_me:$LINENO: checking whether ${F77-f77} $flags $libs works with GETARG and IARGC" >&5
++echo $ECHO_N "checking whether ${F77-f77} $flags $libs works with GETARG and IARGC... $ECHO_C" >&6
++    if { (eval echo "$as_me:$LINENO: \"$ac_fcompilelink\"") >&5
++  (eval $ac_fcompilelink) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -x conftest ; then
+ 	# Check that cross != yes so that this works with autoconf 2.52
+ 	if test "$ac_cv_prog_f77_cross" != "yes" ; then
+ 	    if ./conftest >/dev/null 2>&1 ; then
+@@ -3635,18 +6062,20 @@
+ 		F77_GETARGDECL="$f77_getargdecl"
+ 		F77_GETARG="$f77_getarg"
+ 		F77_IARGC="$f77_iargc"
+-		echo "$ac_t""yes" 1>&6
++		echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+      	    fi
+         fi
+-    fi    
++    fi
+     if test $found_answer = "no" ; then
+-	echo "$ac_t""no" 1>&6
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+     # Grumph.  Here are a bunch of different approaches
+     # We have several axes the check:
+     # Library to link with (none, -lU77 (HPUX), -lg2c (LINUX f77))
+     # PEPCF90 (Intel ifc)
+     # The first line is a dummy
+-    # (we experimented with using a <space>, but this caused other 
++    # (we experimented with using a <space>, but this caused other
+     # problems because we need <space> in the IFS)
+     trial_LIBS="0 -lU77 -lPEPCF90"
+     if test "$NOG2C" != "1" ; then
+@@ -3656,7 +6085,7 @@
+     save_IFS="$IFS"
+     # Make sure that IFS includes a space, or the tests that run programs
+     # may fail
+-    IFS=" 
++    IFS="
+ "
+     save_trial_LIBS="$trial_LIBS"
+     trial_LIBS=""
+@@ -3669,13 +6098,19 @@
+ 	if test "$libs" = "0" ; then
+ 	    lib_ok="yes"
+         else
+-	    echo $ac_n "checking whether Fortran 77 links with $libs""... $ac_c" 1>&6
+-echo "configure:3674: checking whether Fortran 77 links with $libs" >&5
+-	    if { (eval echo configure:3675: \"$ac_fcompilelink_test\") 1>&5; (eval $ac_fcompilelink_test) 2>&5; } && test -x conftest ; then
+-		echo "$ac_t""yes" 1>&6
++	    echo "$as_me:$LINENO: checking whether Fortran 77 links with $libs" >&5
++echo $ECHO_N "checking whether Fortran 77 links with $libs... $ECHO_C" >&6
++	    if { (eval echo "$as_me:$LINENO: \"$ac_fcompilelink_test\"") >&5
++  (eval $ac_fcompilelink_test) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -x conftest ; then
++		echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+ 	        lib_ok="yes"
+ 	    else
+-		echo "$ac_t""no" 1>&6
++		echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ 	        lib_ok="no"
+ 	    fi
+ 	fi
+@@ -3690,7 +6125,7 @@
+     # The -N109 was used for getarg before we realized that GETARG
+     # was necessary with the (non standard conforming) Absoft compiler
+     # (Fortran is monocase; Absoft uses mixedcase by default)
+-    # The -f is used by Absoft and is the compiler switch that folds 
++    # The -f is used by Absoft and is the compiler switch that folds
+     # symbolic names to lower case.  Without this option, the compiler
+     # considers upper- and lower-case letters to be unique.
+     # The -YEXT_NAMES=LCS will cause external names to be output as lower
+@@ -3698,14 +6133,14 @@
+     # The first line is "<space><newline>, the space is important
+     # To make the Absoft f77 and f90 work together, we need to prefer the
+     # upper case versions of the arguments.  They also require libU77.
+-    # -YCFRL=1 causes Absoft f90 to work with g77 and similar (f2c-based) 
++    # -YCFRL=1 causes Absoft f90 to work with g77 and similar (f2c-based)
+     # Fortran compilers
+     #
+     # Problem:  The Intel efc compiler hangs when presented with -N109 .
+     # The only real fix for this is to detect this compiler and exclude
+     # the test.  We may want to reorganize these tests so that if we
+     # can compile code without special options, we never look for them.
+-    # 
++    #
+     using_intel_efc="no"
+     pac_test_msg=`$F77 -V 2>&1 | grep 'Intel(R) Fortran Itanium'`
+     if test "$pac_test_msg" != "" ; then
+@@ -3724,7 +6159,7 @@
+     fi
+     # Discard options that are not available:
+     # (IFS already saved above)
+-    IFS=" 
++    IFS="
+ "
+     save_trial_FLAGS="$trial_FLAGS"
+     trial_FLAGS=""
+@@ -3732,9 +6167,9 @@
+ 	if test "$flag" = " " -o "$flag" = "000" ; then
+ 	    opt_ok="yes"
+         else
+-            
+-echo $ac_n "checking whether Fortran 77 compiler accepts option $flag""... $ac_c" 1>&6
+-echo "configure:3738: checking whether Fortran 77 compiler accepts option $flag" >&5
++
++echo "$as_me:$LINENO: checking whether Fortran 77 compiler accepts option $flag" >&5
++echo $ECHO_N "checking whether Fortran 77 compiler accepts option $flag... $ECHO_C" >&6
+ ac_result="no"
+ save_FFLAGS="$FFLAGS"
+ FFLAGS="$flag $FFLAGS"
+@@ -3749,21 +6184,38 @@
+ EOF
+ ac_fscompilelink='${F77-f77} $save_FFLAGS -o conftest conftest.f $LDFLAGS >conftest.bas 2>&1'
+ ac_fscompilelink2='${F77-f77} $FFLAGS -o conftest conftest.f $LDFLAGS >conftest.out 2>&1'
+-if { (eval echo configure:3753: \"$ac_fscompilelink\") 1>&5; (eval $ac_fscompilelink) 2>&5; } && test -x conftest ; then
+-   if { (eval echo configure:3754: \"$ac_fscompilelink2\") 1>&5; (eval $ac_fscompilelink2) 2>&5; } && test -x conftest ; then
++if { (eval echo "$as_me:$LINENO: \"$ac_fscompilelink\"") >&5
++  (eval $ac_fscompilelink) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -x conftest ; then
++   if { (eval echo "$as_me:$LINENO: \"$ac_fscompilelink2\"") >&5
++  (eval $ac_fscompilelink2) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -x conftest ; then
+       if diff -b conftest.out conftest.bas >/dev/null 2>&1 ; then
+-         echo "$ac_t""yes" 1>&6
+-         echo $ac_n "checking whether routines compiled with $flag can be linked with ones compiled  without $flag""... $ac_c" 1>&6
+-echo "configure:3758: checking whether routines compiled with $flag can be linked with ones compiled  without $flag" >&5       
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++         echo "$as_me:$LINENO: checking whether routines compiled with $flag can be linked with ones compiled  without $flag" >&5
++echo $ECHO_N "checking whether routines compiled with $flag can be linked with ones compiled  without $flag... $ECHO_C" >&6
+          rm -f conftest2.out
+          rm -f conftest.bas
+ 	 ac_fscompile3='${F77-f77} -c $save_FFLAGS conftest2.f >conftest2.out 2>&1'
+ 	 ac_fscompilelink4='${F77-f77} $FFLAGS -o conftest conftest2.o conftest.f $LDFLAGS >conftest.bas 2>&1'
+-         if { (eval echo configure:3763: \"$ac_fscompile3\") 1>&5; (eval $ac_fscompile3) 2>&5; } && test -s conftest2.o ; then
+-            if { (eval echo configure:3764: \"$ac_fscompilelink4\") 1>&5; (eval $ac_fscompilelink4) 2>&5; } && test -x conftest ; then
++         if { (eval echo "$as_me:$LINENO: \"$ac_fscompile3\"") >&5
++  (eval $ac_fscompile3) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest2.o ; then
++            if { (eval echo "$as_me:$LINENO: \"$ac_fscompilelink4\"") >&5
++  (eval $ac_fscompilelink4) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -x conftest ; then
+                if diff -b conftest.out conftest.bas >/dev/null 2>&1 ; then
+ 	          ac_result="yes"
+-	       else 
++	       else
+ 		  echo "configure: Compiler output differed in two cases" >&5
+                   diff -b conftest.out conftest.bas >&5
+ 	       fi
+@@ -3795,10 +6247,12 @@
+     cat conftest.bas >&5
+ fi
+ if test "$ac_result" = "yes" ; then
+-     echo "$ac_t""yes" 1>&6	  
++     echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+      opt_ok=yes
+ else
+-     echo "$ac_t""no" 1>&6
++     echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+      opt_ok=no
+ fi
+ FFLAGS="$save_FFLAGS"
+@@ -3806,10 +6260,10 @@
+ 
+         fi
+ 	if test "$opt_ok" = "yes" ; then
+-	    if test "$flag" = " " -o "$flag" = "000" ; then 
+-		fflag="" 
+-	    else 
+-		fflag="$flag" 
++	    if test "$flag" = " " -o "$flag" = "000" ; then
++		fflag=""
++	    else
++		fflag="$flag"
+ 	    fi
+ 	    # discard options that don't allow mixed-case name matching
+ 	    cat > conftest.f <<EOF
+@@ -3820,13 +6274,19 @@
+         end
+ EOF
+ 	    if test -n "$fflag" ; then flagval="with $fflag" ; else flagval="" ; fi
+-	    echo $ac_n "checking whether Fortran 77 routine names are case-insensitive $flagval""... $ac_c" 1>&6
+-echo "configure:3825: checking whether Fortran 77 routine names are case-insensitive $flagval" >&5
++	    echo "$as_me:$LINENO: checking whether Fortran 77 routine names are case-insensitive $flagval" >&5
++echo $ECHO_N "checking whether Fortran 77 routine names are case-insensitive $flagval... $ECHO_C" >&6
+ 	                            ac_fcompilelink_test="${F77-f77} -o conftest $fflag $FFLAGS conftest.f $LDFLAGS $LIBS 1>&5"
+-	    if { (eval echo configure:3827: \"$ac_fcompilelink_test\") 1>&5; (eval $ac_fcompilelink_test) 2>&5; } && test -x conftest ; then
+-	        echo "$ac_t""yes" 1>&6
++	    if { (eval echo "$as_me:$LINENO: \"$ac_fcompilelink_test\"") >&5
++  (eval $ac_fcompilelink_test) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -x conftest ; then
++	        echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+ 	    else
+-	        echo "$ac_t""no" 1>&6
++	        echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ 	        opt_ok="no"
+             fi
+         fi
+@@ -3839,15 +6299,15 @@
+     # Name of routines.  Since these are in groups, we use a case statement
+     # and loop until the end (accomplished by reaching the end of the
+     # case statement
+-    # For one version of Nag F90, the names are 
++    # For one version of Nag F90, the names are
+     # call f90_unix_MP_getarg(i,s) and f90_unix_MP_iargc().
+     trial=0
+     while test -z "$pac_cv_prog_f77_cmdarg" ; do
+-        case $trial in 
++        case $trial in
+ 	0) # User-specified values, if any
+-	   if test -z "$F77_GETARG" -o -z "$F77_IARGC" ; then 
++	   if test -z "$F77_GETARG" -o -z "$F77_IARGC" ; then
+ 	       trial=`expr $trial + 1`
+-	       continue 
++	       continue
+            fi
+            MSG="Using environment values of F77_GETARG etc."
+ 	   ;;
+@@ -3895,6 +6355,13 @@
+ 		continue
+ 	   fi
+ 	   ;;
++	7) # gfortran won't find getarg if it is marked as external
++	   FXX_MODULE=""
++	   F77_GETARGDECL="intrinsic GETARG"
++	   F77_GETARG="call GETARG(i,s)"
++	   F77_IARGC="IARGC()"
++	   MSG="intrinsic GETARG and IARGC"
++	   ;;
+         *) # exit from while loop
+ 	   FXX_MODULE=""
+ 	   F77_GETARGDECL=""
+@@ -3922,48 +6389,54 @@
+         end
+ EOF
+     #
+-    # Now, try to find some way to compile and link that program, looping 
++    # Now, try to find some way to compile and link that program, looping
+     # over the possibilities of options and libraries
+         save_IFS="$IFS"
+-        IFS=" 
++        IFS="
+ "
+         for libs in $trial_LIBS ; do
+             if test -n "$pac_cv_prog_f77_cmdarg" ; then break ; fi
+ 	    if test "$libs" = " " -o "$libs" = "0" ; then libs="" ; fi
+             for flags in $trial_FLAGS ; do
+ 	        if test "$flags" = " " -o "$flags" = "000"; then flags="" ; fi
+-                echo $ac_n "checking whether ${F77-f77} $flags $libs works with $MSG""... $ac_c" 1>&6
+-echo "configure:3937: checking whether ${F77-f77} $flags $libs works with $MSG" >&5
++                echo "$as_me:$LINENO: checking whether ${F77-f77} $flags $libs works with $MSG" >&5
++echo $ECHO_N "checking whether ${F77-f77} $flags $libs works with $MSG... $ECHO_C" >&6
+ 		IFS="$save_IFS"
+ 			        ac_fcompilelink_test="${F77-f77} -o conftest $FFLAGS $flags conftest.f $LDFLAGS $libs $LIBS 1>&5"
+ 		found_answer="no"
+-                if { (eval echo configure:3941: \"$ac_fcompilelink_test\") 1>&5; (eval $ac_fcompilelink_test) 2>&5; } && test -x conftest ; then
++                if { (eval echo "$as_me:$LINENO: \"$ac_fcompilelink_test\"") >&5
++  (eval $ac_fcompilelink_test) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -x conftest ; then
+ 		    if test "$ac_cv_prog_f77_cross" != "yes" ; then
+ 			if ./conftest >/dev/null 2>&1 ; then
+ 			    found_answer="yes"
+ 			fi
+-		    else 
++		    else
+ 			found_answer="yes"
+ 		    fi
+                 fi
+-	        IFS=" 
++	        IFS="
+ "
+ 		if test "$found_answer" = "yes" ; then
+-	            echo "$ac_t""yes" 1>&6
++	            echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+ 		    pac_cv_prog_f77_cmdarg="$MSG"
+ 		    pac_cv_prog_f77_cmdarg_fflags="$flags"
+ 		    pac_cv_prog_f77_cmdarg_ldflags="$libs"
+ 		    break
+ 	        else
+-                    echo "$ac_t""no" 1>&6
++                    echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ 		    echo "configure: failed program was:" >&5
+                     cat conftest.f >&5
+ 	        fi
+             done
+         done
+-        IFS="$save_IFS"   
++        IFS="$save_IFS"
+ 	rm -f conftest.*
+-        trial=`expr $trial + 1`   
++        trial=`expr $trial + 1`
+     done
+ fi
+ pac_cv_F77_GETARGDECL="$F77_GETARGDECL"
+@@ -3973,10 +6446,12 @@
+ 
+ fi
+ 
+-if test "$found_cached" = "yes" ; then 
+-    echo "$ac_t""$pac_cv_prog_f77_cmdarg" 1>&6
++if test "$found_cached" = "yes" ; then
++    echo "$as_me:$LINENO: result: $pac_cv_prog_f77_cmdarg" >&5
++echo "${ECHO_T}$pac_cv_prog_f77_cmdarg" >&6
+ elif test -z "$pac_cv_F77_IARGC" ; then
+-    echo "configure: warning: Could not find a way to access the command line from Fortran 77" 1>&2
++    { echo "$as_me:$LINENO: WARNING: Could not find a way to access the command line from Fortran 77" >&5
++echo "$as_me: WARNING: Could not find a way to access the command line from Fortran 77" >&2;}
+ fi
+ # Set the variable values based on pac_cv_prog_xxx
+ F77_GETARGDECL="$pac_cv_F77_GETARGDECL"
+@@ -3992,30 +6467,33 @@
+ 
+ 
+ 
+-    if test -z "$pac_cv_F77_IARGC" ; then 
+-        { echo "configure: error: Command line access is required for MPICH" 1>&2; exit 1; }
++    if test -z "$pac_cv_F77_IARGC" ; then
++        { { echo "$as_me:$LINENO: error: Command line access is required for MPICH" >&5
++echo "$as_me: error: Command line access is required for MPICH" >&2;}
++   { (exit 1); exit 1; }; }
+     fi
+-                if test "$F90" = "$F77" ; then 
++                if test "$F90" = "$F77" ; then
+         # We don't need to do anything
+ 	pac_cv_prog_f90_cmdarg_fflags="$pac_cv_prog_f77_cmdarg_fflags"
+ 	pac_cv_prog_f90_cmdarg_ldflags="$pac_cv_prog_f77_cmdarg_ldflags"
+         F90_GETARG_FFLAGS="$pac_cv_prog_f90_cmdarg_fflags"
+         F90_GETARG_LDFLAGS="$pac_cv_prog_f90_cmdarg_ldflags"
+     elif test -n "$F90" -a "$enable_f90" != "no" ; then
+-        echo $ac_n "checking how to compile and link Fortran 90 programs with Fortran 77 programs that access the command line""... $ac_c" 1>&6
+-echo "configure:4007: checking how to compile and link Fortran 90 programs with Fortran 77 programs that access the command line" >&5
+-        if eval "test \"`echo '$''{'pac_cv_prog_f90_cmdarg'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++        echo "$as_me:$LINENO: checking how to compile and link Fortran 90 programs with Fortran 77 programs that access the command line" >&5
++echo $ECHO_N "checking how to compile and link Fortran 90 programs with Fortran 77 programs that access the command line... $ECHO_C" >&6
++        if test "${pac_cv_prog_f90_cmdarg+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
+-	echo "$ac_t""searching..." 1>&6
++
++	echo "$as_me:$LINENO: result: searching..." >&5
++echo "${ECHO_T}searching..." >&6
+ 		cat >conftest.f <<EOF
+        program main
+        character*20 s
+        integer       i, icnt
+        $F77_GETARG
+        icnt = $F77_IARGC
+-       end              
++       end
+ EOF
+ 	MSG="$pac_cv_prog_f77_cmdarg"
+         trial_LIBS="0 -lU77 -lPEPCF90"
+@@ -4029,21 +6507,27 @@
+             for flags in $trial_FLAGS ; do
+ 		if test "$flags" = "0" ; then flags="" ; fi
+ 		if test -z "$MSG" ; then
+-  	  	    echo $ac_n "checking if $F90 $flags $libs works""... $ac_c" 1>&6
+-echo "configure:4034: checking if $F90 $flags $libs works" >&5
++  	  	    echo "$as_me:$LINENO: checking if $F90 $flags $libs works" >&5
++echo $ECHO_N "checking if $F90 $flags $libs works... $ECHO_C" >&6
+ 		else
+-  	  	    echo $ac_n "checking if $F90 $flags $libs works with $MSG""... $ac_c" 1>&6
+-echo "configure:4037: checking if $F90 $flags $libs works with $MSG" >&5
++  	  	    echo "$as_me:$LINENO: checking if $F90 $flags $libs works with $MSG" >&5
++echo $ECHO_N "checking if $F90 $flags $libs works with $MSG... $ECHO_C" >&6
+                 fi
+ 	        ac_f90compilelink_test="${F90-f90} -o conftest $F90FLAGS $flags conftest.f $libs $LIBS 1>&5"
+-		if { (eval echo configure:4040: \"$ac_f90compilelink_test\") 1>&5; (eval $ac_f90compilelink_test) 2>&5; } && test -x conftest ; then
+-		    echo "$ac_t""yes" 1>&6
++		if { (eval echo "$as_me:$LINENO: \"$ac_f90compilelink_test\"") >&5
++  (eval $ac_f90compilelink_test) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -x conftest ; then
++		    echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+ 		    pac_cv_prog_f90_cmdarg="$flags $libs"
+ 		    pac_cv_prog_f90_cmdarg_flags="$flags"
+ 		    pac_cv_prog_f90_cmdarg_ldflags="$libs"
+ 		    break
+ 	        else
+-		    echo "$ac_t""no" 1>&6
++		    echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ 		    echo "configure: failed program was:" >&5
+                     cat conftest.f >&5
+ 	        fi
+@@ -4053,11 +6537,12 @@
+ 
+ fi
+ 
+-	echo "$ac_t""$pac_cv_prog_f90_cmdarg" 1>&6
++	echo "$as_me:$LINENO: result: $pac_cv_prog_f90_cmdarg" >&5
++echo "${ECHO_T}$pac_cv_prog_f90_cmdarg" >&6
+         F90_GETARG_FFLAGS="$pac_cv_prog_f90_cmdarg_fflags"
+         F90_GETARG_LDFLAGS="$pac_cv_prog_f90_cmdarg_ldflags"
+-        
+-        
++
++
+     fi
+     # We need to add F77_GETARG_FFLAGS to FFLAGS or to F77 (they may
+     # change the compiler, for example, by changing the way external
+@@ -4069,224 +6554,367 @@
+ FLIBS_save="$FLIBS"
+ FLIBS=""
+ 
+-# Make sure we can run config.sub.
+-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++echo "$as_me:$LINENO: checking how to get verbose linking output from $F77" >&5
++echo $ECHO_N "checking how to get verbose linking output from $F77... $ECHO_C" >&6
++if test "${ac_cv_prog_f77_v+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_f77_v=
++# Try some options frequently used verbose output
++for ac_verb in -v -verbose --verbose -V -\#\#\#; do
++  cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++
++# Compile and link our simple test program by passing a flag (argument
++# 1 to this macro) to the Fortran compiler in order to get
++# "verbose" output that we can then parse for the Fortran linker
++# flags.
++ac_save_FFLAGS=$FFLAGS
++FFLAGS="$FFLAGS $ac_verb"
++(eval echo $as_me:6607: \"$ac_link\") >&5
++ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
++echo "$ac_f77_v_output" >&5
++FFLAGS=$ac_save_FFLAGS
++
++rm -f conftest*
++
++# On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where
++# /foo, /bar, and /baz are search directories for the Fortran linker.
++# Here, we change these into -L/foo -L/bar -L/baz (and put it first):
++ac_f77_v_output="`echo $ac_f77_v_output |
++	grep 'LPATH is:' |
++	sed 's,.*LPATH is\(: *[^ ]*\).*,\1,;s,: */, -L/,g'` $ac_f77_v_output"
++
++case $ac_f77_v_output in
++  # If we are using xlf then replace all the commas with spaces.
++  *xlfentry*)
++    ac_f77_v_output=`echo $ac_f77_v_output | sed 's/,/ /g'` ;;
++
++  # With Intel ifc, ignore the quoted -mGLOB_options_string stuff (quoted
++  # $LIBS confuse us, and the libraries appear later in the output anyway).
++  *mGLOB_options_string*)
++    ac_f77_v_output=`echo $ac_f77_v_output | sed 's/\"-mGLOB[^\"]*\"/ /g'` ;;
++
++  # If we are using Cray Fortran then delete quotes.
++  # Use "\"" instead of '"' for font-lock-mode.
++  # FIXME: a more general fix for quoted arguments with spaces?
++  *cft90*)
++    ac_f77_v_output=`echo $ac_f77_v_output | sed "s/\"//g"` ;;
++esac
++
++
++  # look for -l* and *.a constructs in the output
++  for ac_arg in $ac_f77_v_output; do
++     case $ac_arg in
++        [\\/]*.a | ?:[\\/]*.a | -[lLRu]*)
++          ac_cv_prog_f77_v=$ac_verb
++          break 2 ;;
++     esac
++  done
++done
++if test -z "$ac_cv_prog_f77_v"; then
++   { echo "$as_me:$LINENO: WARNING: cannot determine how to obtain linking information from $F77" >&5
++echo "$as_me: WARNING: cannot determine how to obtain linking information from $F77" >&2;}
+ fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:4079: checking host system type" >&5
+-
+-host_alias=$host
+-case "$host_alias" in
+-NONE)
+-  case $nonopt in
+-  NONE)
+-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
+-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+-    fi ;;
+-  *) host_alias=$nonopt ;;
+-  esac ;;
++{ echo "$as_me:$LINENO: WARNING: compilation failed" >&5
++echo "$as_me: WARNING: compilation failed" >&2;}
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_f77_v" >&5
++echo "${ECHO_T}$ac_cv_prog_f77_v" >&6
++echo "$as_me:$LINENO: checking for Fortran libraries of $F77" >&5
++echo $ECHO_N "checking for Fortran libraries of $F77... $ECHO_C" >&6
++if test "${ac_cv_f77_libs+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "x$FLIBS" != "x"; then
++  ac_cv_f77_libs="$FLIBS" # Let the user override the test.
++else
++
++cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++
++# Compile and link our simple test program by passing a flag (argument
++# 1 to this macro) to the Fortran compiler in order to get
++# "verbose" output that we can then parse for the Fortran linker
++# flags.
++ac_save_FFLAGS=$FFLAGS
++FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
++(eval echo $as_me:6685: \"$ac_link\") >&5
++ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
++echo "$ac_f77_v_output" >&5
++FFLAGS=$ac_save_FFLAGS
++
++rm -f conftest*
++
++# On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where
++# /foo, /bar, and /baz are search directories for the Fortran linker.
++# Here, we change these into -L/foo -L/bar -L/baz (and put it first):
++ac_f77_v_output="`echo $ac_f77_v_output |
++	grep 'LPATH is:' |
++	sed 's,.*LPATH is\(: *[^ ]*\).*,\1,;s,: */, -L/,g'` $ac_f77_v_output"
++
++case $ac_f77_v_output in
++  # If we are using xlf then replace all the commas with spaces.
++  *xlfentry*)
++    ac_f77_v_output=`echo $ac_f77_v_output | sed 's/,/ /g'` ;;
++
++  # With Intel ifc, ignore the quoted -mGLOB_options_string stuff (quoted
++  # $LIBS confuse us, and the libraries appear later in the output anyway).
++  *mGLOB_options_string*)
++    ac_f77_v_output=`echo $ac_f77_v_output | sed 's/\"-mGLOB[^\"]*\"/ /g'` ;;
++
++  # If we are using Cray Fortran then delete quotes.
++  # Use "\"" instead of '"' for font-lock-mode.
++  # FIXME: a more general fix for quoted arguments with spaces?
++  *cft90*)
++    ac_f77_v_output=`echo $ac_f77_v_output | sed "s/\"//g"` ;;
+ esac
+ 
+-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+-echo "$ac_t""$host" 1>&6
+-
+-echo $ac_n "checking for Fortran 77 libraries""... $ac_c" 1>&6
+-echo "configure:4100: checking for Fortran 77 libraries" >&5
+-
+-
+-if eval "test \"`echo '$''{'ac_cv_flibs'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  echo "      END" > conftest.f
+-foutput=`${F77} -v -o conftest conftest.f 2>&1`
+-g77_p=`echo $foutput | grep GNU`
+-if test -n "$g77_p" ; then
+-  foutput=`${F77} -v -o conftest conftest.f 2>&1 | sed '/^Driving:/d'`
+-fi
+-xlf_p=`echo $foutput | grep xlfentry`
+-if test -n "$xlf_p"; then
+-  foutput=`echo $foutput | sed 's/,/ /g'`
+-fi
+-ld_run_path=`echo $foutput | \
+-  sed -n -e 's/^.*LD_RUN_PATH *= *\([^ ]*\).*/\1/p'`
+-case "$ld_run_path" in
+-  /*)
+-    if test "$ac_cv_prog_gcc" = yes; then
+-      ld_run_path="-Xlinker -R -Xlinker $ld_run_path"
+-    else
+-      ld_run_path="-R $ld_run_path"
++
++
++ac_cv_f77_libs=
++
++# Save positional arguments (if any)
++ac_save_positional="$@"
++
++set X $ac_f77_v_output
++while test $# != 1; do
++  shift
++  ac_arg=$1
++  case $ac_arg in
++        [\\/]*.a | ?:[\\/]*.a)
++            ac_exists=false
++  for ac_i in $ac_cv_f77_libs; do
++    if test x"$ac_arg" = x"$ac_i"; then
++      ac_exists=true
++      break
+     fi
+-  ;;
+-  *)
+-    ld_run_path=
+-  ;;
+-esac
+-flibs=
+-lflags=
+-want_arg=
+-for arg in $foutput; do
+-  old_want_arg=$want_arg
+-  want_arg=
+-  if test -n "$old_want_arg"; then
+-    case "$arg" in
+-      -*)
+-        old_want_arg=
+-      ;;
+-    esac
+-  fi
+-  case "$old_want_arg" in
+-    '')
+-      case $arg in
+-        /*.a)
+-          exists=false
+-          for f in $lflags; do
+-            if test x$arg = x$f; then
+-              exists=true
+-            fi
+-          done
+-          if $exists; then
+-            arg=
+-          else
+-            lflags="$lflags $arg"
+-          fi
+-        ;;
++  done
++
++  if test x"$ac_exists" = xtrue; then
++  :
++else
++  ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"
++fi
++
++          ;;
+         -bI:*)
+-          exists=false
+-          for f in $lflags; do
+-            if test x$arg = x$f; then
+-              exists=true
+-            fi
++            ac_exists=false
++  for ac_i in $ac_cv_f77_libs; do
++    if test x"$ac_arg" = x"$ac_i"; then
++      ac_exists=true
++      break
++    fi
++  done
++
++  if test x"$ac_exists" = xtrue; then
++  :
++else
++  if test "$ac_compiler_gnu" = yes; then
++  for ac_link_opt in $ac_arg; do
++    ac_cv_f77_libs="$ac_cv_f77_libs -Xlinker $ac_link_opt"
++  done
++else
++  ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"
++fi
++fi
++
++          ;;
++          # Ignore these flags.
++        -lang* | -lcrt*.o | -lc | -lgcc | -libmil | -LANG:=*)
++          ;;
++        -lkernel32)
++          test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"
++          ;;
++        -[LRuY])
++          # These flags, when seen by themselves, take an argument.
++          # We remove the space between option and argument and re-iterate
++          # unless we find an empty arg or a new option (starting with -)
++	  case $2 in
++	     "" | -*);;
++	     *)
++		ac_arg="$ac_arg$2"
++		shift; shift
++		set X $ac_arg "$@"
++		;;
++	  esac
++          ;;
++        -YP,*)
++          for ac_j in `echo $ac_arg | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do
++              ac_exists=false
++  for ac_i in $ac_cv_f77_libs; do
++    if test x"$ac_j" = x"$ac_i"; then
++      ac_exists=true
++      break
++    fi
++  done
++
++  if test x"$ac_exists" = xtrue; then
++  :
++else
++  ac_arg="$ac_arg $ac_j"
++                               ac_cv_f77_libs="$ac_cv_f77_libs $ac_j"
++fi
++
+           done
+-          if $exists; then
+-            arg=
+-          else
+-            if test "$ac_cv_prog_gcc" = yes; then
+-              lflags="$lflags -Xlinker $arg"
+-            else
+-              lflags="$lflags $arg"
+-            fi
+-          fi
+-        ;;
+-        -lang* | -lcrt0.o | -lc | -lgcc)
+-          arg=
+-        ;;
+-        -[lLR])
+-          want_arg=$arg
+-          arg=
+-        ;;
++          ;;
+         -[lLR]*)
+-          exists=false
+-          for f in $lflags; do
+-            if test x$arg = x$f; then
+-              exists=true
+-            fi
+-          done
+-          if $exists; then
+-            arg=
+-          else
+-            case "$arg" in
+-              -lkernel32)
+-                case "$canonical_host_type" in
+-                  *-*-cygwin*)
+-                    arg=
+-                  ;;
+-                  *)
+-                    lflags="$lflags $arg"
+-                  ;;
+-                esac
+-              ;;
+-              -lm)
+-              ;;
+-              *)
+-                lflags="$lflags $arg"
+-              ;;
+-            esac
+-          fi
+-        ;;
+-        -u)
+-          want_arg=$arg
+-          arg=
+-        ;;
+-        -Y)
+-          want_arg=$arg
+-          arg=
+-        ;;
+-        *)
+-          arg=
+-        ;;
+-      esac
+-    ;;
+-    -[lLR])
+-      arg="$old_want_arg $arg"
+-    ;;
+-    -u)
+-      arg="-u $arg"
+-    ;;
+-    -Y)
+-      arg=`echo $arg | sed -e 's%^P,%%'`
+-      SAVE_IFS=$IFS
+-      IFS=:
+-      list=
+-      for elt in $arg; do
+-        list="$list -L$elt"
+-      done
+-      IFS=$SAVE_IFS
+-      arg="$list"
+-    ;;
++            ac_exists=false
++  for ac_i in $ac_cv_f77_libs; do
++    if test x"$ac_arg" = x"$ac_i"; then
++      ac_exists=true
++      break
++    fi
++  done
++
++  if test x"$ac_exists" = xtrue; then
++  :
++else
++  ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"
++fi
++
++          ;;
++          # Ignore everything else.
+   esac
+-  if test -n "$arg"; then
+-    flibs="$flibs $arg"
+-  fi
+ done
+-if test -n "$ld_run_path"; then
+-  flibs_result="$ld_run_path $flibs"
++# restore positional arguments
++set X $ac_save_positional; shift
++
++# We only consider "LD_RUN_PATH" on Solaris systems.  If this is seen,
++# then we insist that the "run path" must be an absolute path (i.e. it
++# must begin with a "/").
++case `(uname -sr) 2>/dev/null` in
++   "SunOS 5"*)
++      ac_ld_run_path=`echo $ac_f77_v_output |
++                        sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'`
++      test "x$ac_ld_run_path" != x &&
++        if test "$ac_compiler_gnu" = yes; then
++  for ac_link_opt in $ac_ld_run_path; do
++    ac_cv_f77_libs="$ac_cv_f77_libs -Xlinker $ac_link_opt"
++  done
+ else
+-  flibs_result="$flibs"
++  ac_cv_f77_libs="$ac_cv_f77_libs $ac_ld_run_path"
+ fi
+-ac_cv_flibs="$flibs_result"
++      ;;
++esac
++fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x"
++
+ fi
++echo "$as_me:$LINENO: result: $ac_cv_f77_libs" >&5
++echo "${ECHO_T}$ac_cv_f77_libs" >&6
++FLIBS="$ac_cv_f77_libs"
+ 
+-FLIBS="$ac_cv_flibs"
+-echo "$ac_t""$FLIBS" 1>&6
+ 
+-echo $ac_n "checking whether C can link with $FLIBS""... $ac_c" 1>&6
+-echo "configure:4259: checking whether C can link with $FLIBS" >&5
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++echo "$as_me:$LINENO: checking whether C can link with $FLIBS" >&5
++echo $ECHO_N "checking whether C can link with $FLIBS... $ECHO_C" >&6
+ # Try to link a C program with all of these libraries
+ save_LIBS="$LIBS"
+ LIBS="$LIBS $FLIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 4264 "configure"
+-#include "confdefs.h"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-int main() {
++int
++main ()
++{
+ int a;
+-; return 0; }
+-EOF
+-if { (eval echo configure:4271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   runs=yes
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  runs=no
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++runs=no
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+ LIBS="$save_LIBS"
+-echo "$ac_t""$runs" 1>&6
++echo "$as_me:$LINENO: result: $runs" >&5
++echo "${ECHO_T}$runs" >&6
+ if test "$runs" = "no" ; then
+-    echo $ac_n "checking for which libraries can be used""... $ac_c" 1>&6
+-echo "configure:4285: checking for which libraries can be used" >&5
++    echo "$as_me:$LINENO: checking for which libraries can be used" >&5
++echo $ECHO_N "checking for which libraries can be used... $ECHO_C" >&6
+     pac_ldirs=""
+     pac_libs=""
+     pac_other=""
+     for name in $FLIBS ; do
+-        case $name in 
++        case $name in
+         -l*) pac_libs="$pac_libs $name" ;;
+         -L*) pac_ldirs="$pac_ldirs $name" ;;
+         *)   pac_other="$pac_other $name" ;;
+@@ -4294,55 +6922,111 @@
+     done
+     save_LIBS="$LIBS"
+     keep_libs=""
+-    for name in $pac_libs ; do 
++    for name in $pac_libs ; do
+         LIBS="$save_LIBS $pac_ldirs $pac_other $name"
+-        cat > conftest.$ac_ext <<EOF
+-#line 4301 "configure"
+-#include "confdefs.h"
++        cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-int main() {
++int
++main ()
++{
+ int a;
+-; return 0; }
+-EOF
+-if { (eval echo configure:4308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   runs=yes
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  runs=no
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++runs=no
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+         if test $runs = "yes" ; then keep_libs="$keep_libs $name" ; fi
+     done
+-    echo "$ac_t""$keep_libs" 1>&6
++    echo "$as_me:$LINENO: result: $keep_libs" >&5
++echo "${ECHO_T}$keep_libs" >&6
+     LIBS="$save_LIBS"
+     FLIBS="$pac_ldirs $pac_other $keep_libs"
+ fi
+ 
+ 
+-cat > conftest.$ac_ext <<EOF
+-#line 4327 "configure"
+-#include "confdefs.h"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-int main() {
++int
++main ()
++{
+ long long a;
+-; return 0; }
+-EOF
+-if { (eval echo configure:4334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
+-  cat >> confdefs.h <<\EOF
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LONG_LONG 1
+-EOF
++_ACEOF
+ 
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest*
+-echo $ac_n "checking for linker for Fortran main programs""... $ac_c" 1>&6
+-echo "configure:4346: checking for linker for Fortran main programs" >&5
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: checking for linker for Fortran main programs" >&5
++echo $ECHO_N "checking for linker for Fortran main programs... $ECHO_C" >&6
+ cat > conftest.c <<EOF
+ #include "confdefs.h"
+ #ifdef HAVE_LONG_LONG
+@@ -4352,22 +7036,28 @@
+ #endif
+ EOF
+ 
++
+ ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-if { (eval echo configure:4363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
+     mv conftest.o conftest1.o
+ else
+-    { echo "configure: error: Could not compile C test program" 1>&2; exit 1; }
++    { { echo "$as_me:$LINENO: error: Could not compile C test program" >&5
++echo "$as_me: error: Could not compile C test program" >&2;}
++   { (exit 1); exit 1; }; }
+ fi
+ ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+ cat > conftest.f <<EOF
+         program main
+@@ -4375,36 +7065,49 @@
+         print *, "hi"
+         end
+ EOF
+-if { (eval echo configure:4379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-    if ${F77} -o conftest conftest.o conftest1.o $LDFLAGS 2>&5 ; then
+-	echo "$ac_t""Use Fortran to link programs" 1>&6
+-    elif ${CC} -o conftest conftest.o conftest1.o $LDFLAGS $FLIBS 2>&5 ; then
+-	echo "$ac_t""Use C with FLIBS to link programs" 1>&6
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    # We include $FFLAGS on the link line because this is
++    # the way in which most of the configure tests run.  In particular,
++    # many users are used to using FFLAGS (and CFLAGS) to select
++    # different instruction sets, such as 64-bit with -xarch=v9 for
++    # Solaris.
++    if ${F77} ${FFLAGS} -o conftest conftest.o conftest1.o $LDFLAGS 2>&5 ; then
++	echo "$as_me:$LINENO: result: Use Fortran to link programs" >&5
++echo "${ECHO_T}Use Fortran to link programs" >&6
++    elif ${CC} ${CFLAGS} -o conftest conftest.o conftest1.o $LDFLAGS $FLIBS 2>&5 ; then
++	echo "$as_me:$LINENO: result: Use C with FLIBS to link programs" >&5
++echo "${ECHO_T}Use C with FLIBS to link programs" >&6
+ 	F77LINKER="$CC"
+         F77_LDFLAGS="$F77_LDFLAGS $FLIBS"
+     else
+-	echo "$ac_t""Unable to determine how to link Fortran programs with C" 1>&6
++	echo "$as_me:$LINENO: result: Unable to determine how to link Fortran programs with C" >&5
++echo "${ECHO_T}Unable to determine how to link Fortran programs with C" >&6
+     fi
+ else
+-    { echo "configure: error: Could not compile Fortran test program" 1>&2; exit 1; }
++    { { echo "$as_me:$LINENO: error: Could not compile Fortran test program" >&5
++echo "$as_me: error: Could not compile Fortran test program" >&2;}
++   { (exit 1); exit 1; }; }
+ fi
+ ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ 
+-echo $ac_n "checking for Fortran 77 name mangling""... $ac_c" 1>&6
+-echo "configure:4402: checking for Fortran 77 name mangling" >&5
+-if eval "test \"`echo '$''{'pac_cv_prog_f77_name_mangle'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for Fortran 77 name mangling" >&5
++echo $ECHO_N "checking for Fortran 77 name mangling... $ECHO_C" >&6
++if test "${pac_cv_prog_f77_name_mangle+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+    # Check for strange behavior of Fortran.  For example, some FreeBSD
+-   # systems use f2c to implement f77, and the version of f2c that they 
++   # systems use f2c to implement f77, and the version of f2c that they
+    # use generates TWO (!!!) trailing underscores
+    # Currently, WDEF is not used but could be...
+    #
+@@ -4422,228 +7125,438 @@
+    if test "X$ac_fcompile" = "X" ; then
+        ac_fcompile='${F77-f77} -c $FFLAGS conftest.f 1>&5'
+    fi
+-   if { (eval echo configure:4426: \"$ac_fcompile\") 1>&5; (eval $ac_fcompile) 2>&5; } && test -s conftest.o ; then
++   if { (eval echo "$as_me:$LINENO: \"$ac_fcompile\"") >&5
++  (eval $ac_fcompile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest.o ; then
+ 	mv conftest.o fconftestf.o
+-   else 
++   else
+ 	echo "configure: failed program was:" >&5
+         cat conftest.f >&5
+    fi
+ 
+-   
++
++
+    ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-   
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
+    save_LIBS="$LIBS"
+       LIBS="fconftestf.o $FLIBS $LIBS"
+-   cat > conftest.$ac_ext <<EOF
+-#line 4444 "configure"
+-#include "confdefs.h"
++   cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-int main() {
++int
++main ()
++{
+ my_name();
+-; return 0; }
+-EOF
+-if { (eval echo configure:4451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   pac_cv_prog_f77_name_mangle="lower"
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+    if test  "X$pac_cv_prog_f77_name_mangle" = "X" ; then
+-     cat > conftest.$ac_ext <<EOF
+-#line 4461 "configure"
+-#include "confdefs.h"
++     cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-int main() {
++int
++main ()
++{
+ my_name_();
+-; return 0; }
+-EOF
+-if { (eval echo configure:4468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   pac_cv_prog_f77_name_mangle="lower underscore"
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+    fi
+    if test  "X$pac_cv_prog_f77_name_mangle" = "X" ; then
+-     cat > conftest.$ac_ext <<EOF
+-#line 4479 "configure"
+-#include "confdefs.h"
++     cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ void __stdcall MY_NAME(int);
+-int main() {
++int
++main ()
++{
+ MY_NAME(0);
+-; return 0; }
+-EOF
+-if { (eval echo configure:4486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   pac_cv_prog_f77_name_mangle="upper stdcall"
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+    fi
+    if test  "X$pac_cv_prog_f77_name_mangle" = "X" ; then
+-     cat > conftest.$ac_ext <<EOF
+-#line 4497 "configure"
+-#include "confdefs.h"
++     cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-int main() {
++int
++main ()
++{
+ MY_NAME();
+-; return 0; }
+-EOF
+-if { (eval echo configure:4504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   pac_cv_prog_f77_name_mangle="upper"
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+    fi
+    if test  "X$pac_cv_prog_f77_name_mangle" = "X" ; then
+-     cat > conftest.$ac_ext <<EOF
+-#line 4515 "configure"
+-#include "confdefs.h"
++     cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-int main() {
++int
++main ()
++{
+ my_name__();
+-; return 0; }
+-EOF
+-if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   pac_cv_prog_f77_name_mangle="lower doubleunderscore"
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+    fi
+    if test  "X$pac_cv_prog_f77_name_mangle" = "X" ; then
+-     cat > conftest.$ac_ext <<EOF
+-#line 4533 "configure"
+-#include "confdefs.h"
++     cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-int main() {
++int
++main ()
++{
+ MY_name();
+-; return 0; }
+-EOF
+-if { (eval echo configure:4540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   pac_cv_prog_f77_name_mangle="mixed"
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+    fi
+    if test  "X$pac_cv_prog_f77_name_mangle" = "X" ; then
+-     cat > conftest.$ac_ext <<EOF
+-#line 4551 "configure"
+-#include "confdefs.h"
++     cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-int main() {
++int
++main ()
++{
+ MY_name_();
+-; return 0; }
+-EOF
+-if { (eval echo configure:4558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   pac_cv_prog_f77_name_mangle="mixed underscore"
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+    fi
+    LIBS="$save_LIBS"
+    ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+    rm -f fconftest*
+ 
+ fi
+-
+-echo "$ac_t""$pac_cv_prog_f77_name_mangle" 1>&6
++echo "$as_me:$LINENO: result: $pac_cv_prog_f77_name_mangle" >&5
++echo "${ECHO_T}$pac_cv_prog_f77_name_mangle" >&6
+ # Make the actual definition
+ pac_namecheck=`echo X$pac_cv_prog_f77_name_mangle | sed 's/ /-/g'`
+ 
+ pac_cv_test_stdcall=""
+ case $pac_namecheck in
+-    X) echo "configure: warning: Cannot determine Fortran naming scheme" 1>&2 ;;
+-    Xlower) cat >> confdefs.h <<\EOF
++    X) { echo "$as_me:$LINENO: WARNING: Cannot determine Fortran naming scheme" >&5
++echo "$as_me: WARNING: Cannot determine Fortran naming scheme" >&2;} ;;
++    Xlower)
++cat >>confdefs.h <<\_ACEOF
+ #define F77_NAME_LOWER 1
+-EOF
+- 
++_ACEOF
++
+ 	F77_NAME_MANGLE="F77_NAME_LOWER"
+ 	;;
+-    Xlower-underscore) cat >> confdefs.h <<\EOF
++    Xlower-underscore)
++cat >>confdefs.h <<\_ACEOF
+ #define F77_NAME_LOWER_USCORE 1
+-EOF
++_ACEOF
+ 
+ 	F77_NAME_MANGLE="F77_NAME_LOWER_USCORE"
+ 	 ;;
+-    Xlower-doubleunderscore) cat >> confdefs.h <<\EOF
++    Xlower-doubleunderscore)
++cat >>confdefs.h <<\_ACEOF
+ #define F77_NAME_LOWER_2USCORE 1
+-EOF
++_ACEOF
+ 
+ 	F77_NAME_MANGLE="F77_NAME_LOWER_2USCORE"
+ 	 ;;
+-    Xupper) cat >> confdefs.h <<\EOF
++    Xupper)
++cat >>confdefs.h <<\_ACEOF
+ #define F77_NAME_UPPER 1
+-EOF
+- 
++_ACEOF
++
+ 	F77_NAME_MANGLE="F77_NAME_UPPER"
+ 	;;
+-    Xmixed) cat >> confdefs.h <<\EOF
++    Xmixed)
++cat >>confdefs.h <<\_ACEOF
+ #define F77_NAME_MIXED 1
+-EOF
+- 
++_ACEOF
++
+ 	F77_NAME_MANGLE="F77_NAME_MIXED"
+ 	;;
+-    Xmixed-underscore) cat >> confdefs.h <<\EOF
++    Xmixed-underscore)
++cat >>confdefs.h <<\_ACEOF
+ #define F77_NAME_MIXED_USCORE 1
+-EOF
+- 
++_ACEOF
++
+ 	F77_NAME_MANGLE="F77_NAME_MIXED_USCORE"
+ 	;;
+-    Xupper-stdcall) cat >> confdefs.h <<\EOF
++    Xupper-stdcall)
++cat >>confdefs.h <<\_ACEOF
+ #define F77_NAME_UPPER 1
+-EOF
++_ACEOF
+ 
+         F77_NAME_MANGLE="F77_NAME_UPPER_STDCALL"
+         pac_cv_test_stdcall="__stdcall"
+         ;;
+-    *) echo "configure: warning: Unknown Fortran naming scheme" 1>&2 ;;
++    *) { echo "$as_me:$LINENO: WARNING: Unknown Fortran naming scheme" >&5
++echo "$as_me: WARNING: Unknown Fortran naming scheme" >&2;} ;;
+ esac
+ 
++# Get the standard call definition
++# FIXME: This should use F77_STDCALL, not STDCALL (non-conforming name)
+ if test "X$pac_cv_test_stdcall" = "X" ; then
+-        cat >> confdefs.h <<\EOF
+-#define STDCALL 
+-EOF
+-
++    F77_STDCALL=""
+ else
+-        cat >> confdefs.h <<\EOF
+-#define STDCALL __stdcall
+-EOF
+-
++    F77_STDCALL="__stdcall"
+ fi
++#
+ 
++cat >>confdefs.h <<_ACEOF
++#define STDCALL $F77_STDCALL
++_ACEOF
+ 
+ 
+-echo $ac_n "checking for which Fortran libraries are needed to link C with Fortran""... $ac_c" 1>&6
+-echo "configure:4647: checking for which Fortran libraries are needed to link C with Fortran" >&5
++
++
++echo "$as_me:$LINENO: checking for which Fortran libraries are needed to link C with Fortran" >&5
++echo $ECHO_N "checking for which Fortran libraries are needed to link C with Fortran... $ECHO_C" >&6
+ F77_IN_C_LIBS="$FLIBS"
+ rm -f conftest*
+ cat <<EOF > conftest.f
+@@ -4653,23 +7566,32 @@
+ if test "X$ac_fcompile" = "X" ; then
+     ac_fcompile='${F77-f77} -c $FFLAGS conftest.f 1>&5'
+ fi
+-if { (eval echo configure:4657: \"$ac_fcompile\") 1>&5; (eval $ac_fcompile) 2>&5; } && test -s conftest.o ; then
++if { (eval echo "$as_me:$LINENO: \"$ac_fcompile\"") >&5
++  (eval $ac_fcompile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest.o ; then
+     mv conftest.o mconftestf.o
+-    
++
++
+     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+     save_LIBS="$LIBS"
+         LIBS="mconftestf.o $save_LIBS"
+-    cat > conftest.$ac_ext <<EOF
+-#line 4670 "configure"
+-#include "confdefs.h"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdio.h>
+-int main() {
++int
++main ()
++{
+ 
+ #ifdef F77_NAME_UPPER
+ #define ftest_ FTEST
+@@ -4678,28 +7600,55 @@
+ #endif
+ ftest_();
+ 
+-; return 0; }
+-EOF
+-if { (eval echo configure:4684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   link_worked=yes
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  link_worked=no 
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++link_worked=no
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+     if test "$link_worked" = "no" ; then
+         flibdirs=`echo $FLIBS | tr ' ' '\012' | grep '\-L' | tr '\012' ' '`
+         fliblibs=`echo $FLIBS | tr ' ' '\012' | grep -v '\-L' | tr '\012' ' '`
+         for flibs in $fliblibs ; do
+             LIBS="mconftestf.o $flibdirs $flibs $save_LIBS"
+-            cat > conftest.$ac_ext <<EOF
+-#line 4700 "configure"
+-#include "confdefs.h"
++            cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdio.h>
+-int main() {
++int
++main ()
++{
+ 
+ #ifdef F77_NAME_UPPER
+ #define ftest_ FTEST
+@@ -4708,19 +7657,41 @@
+ #endif
+ ftest_();
+ 
+-; return 0; }
+-EOF
+-if { (eval echo configure:4714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   link_worked=yes
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  link_worked=no 
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++link_worked=no
+ fi
+-rm -f conftest*
+-            if test "$link_worked" = "yes" ; then 
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++            if test "$link_worked" = "yes" ; then
+ 	        F77_IN_C_LIBS="$flibdirs $flibs"
+                 break
+             fi
+@@ -4731,11 +7702,16 @@
+         for flibs in $fliblibs ; do
+ 	    flibscat="$flibscat $flibs"
+             LIBS="mconftestf.o $flibdirs $flibscat $save_LIBS"
+-            cat > conftest.$ac_ext <<EOF
+-#line 4736 "configure"
+-#include "confdefs.h"
++            cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdio.h>
+-int main() {
++int
++main ()
++{
+ 
+ #ifdef F77_NAME_UPPER
+ #define ftest_ FTEST
+@@ -4744,19 +7720,41 @@
+ #endif
+ ftest_();
+ 
+-; return 0; }
+-EOF
+-if { (eval echo configure:4750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   link_worked=yes
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  link_worked=no 
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++link_worked=no
+ fi
+-rm -f conftest*
+-            if test "$link_worked" = "yes" ; then 
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++            if test "$link_worked" = "yes" ; then
+ 	        F77_IN_C_LIBS="$flibdirs $flibscat"
+                 break
+             fi
+@@ -4768,128 +7766,103 @@
+     fi
+     LIBS="$save_LIBS"
+     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-else 
++else
+     echo "configure: failed program was:" >&5
+     cat conftest.f >&5
+ fi
+ rm -f conftest* mconftest*
+ if test -z "$F77_IN_C_LIBS" ; then
+-    echo "$ac_t""none" 1>&6
++    echo "$as_me:$LINENO: result: none" >&5
++echo "${ECHO_T}none" >&6
+ else
+-    echo "$ac_t""$F77_IN_C_LIBS" 1>&6
++    echo "$as_me:$LINENO: result: $F77_IN_C_LIBS" >&5
++echo "${ECHO_T}$F77_IN_C_LIBS" >&6
+ fi
+ 
+ 
+ ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+ 
+-echo $ac_n "checking whether Fortran accepts ! for comments""... $ac_c" 1>&6
+-echo "configure:4797: checking whether Fortran accepts ! for comments" >&5
+-if eval "test \"`echo '$''{'pac_cv_prog_f77_exclaim_comments'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking whether Fortran accepts ! for comments" >&5
++echo $ECHO_N "checking whether Fortran accepts ! for comments... $ECHO_C" >&6
++if test "${pac_cv_prog_f77_exclaim_comments+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
+ 
+-ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
+ 
+-cat > conftest.$ac_ext <<EOF
+-      program main
+ 
+-!      This is a comment
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
++cat >conftest.$ac_ext <<_ACEOF
++      program main
++!        This is a comment
+       end
+-EOF
+-if { (eval echo configure:4815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   pac_cv_prog_f77_exclaim_comments="yes"
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  pac_cv_prog_f77_exclaim_comments="no"
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++pac_cv_prog_f77_exclaim_comments="no"
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+ 
+ fi
+-
+-echo "$ac_t""$pac_cv_prog_f77_exclaim_comments" 1>&6
++echo "$as_me:$LINENO: result: $pac_cv_prog_f77_exclaim_comments" >&5
++echo "${ECHO_T}$pac_cv_prog_f77_exclaim_comments" >&6
+ if test "$pac_cv_prog_f77_exclaim_comments" = "yes" ; then
+     has_exclaim="yes"
+ else
+     has_exclaim="no"
+ fi
+ 
+-
+-echo $ac_n "checking whether Fortran supports new-style character declarations""... $ac_c" 1>&6
+-echo "configure:4842: checking whether Fortran supports new-style character declarations" >&5
+-if eval "test \"`echo '$''{'pac_cv_prog_f77_new_char_decl'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  
+-
+-ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
+-
+-cat > conftest.$ac_ext <<EOF
+-      program main
+-
+-        character (len=10) s
+-
+-      end
+-EOF
+-if { (eval echo configure:4860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
+-  pac_cv_prog_f77_new_char_decl="yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  pac_cv_prog_f77_new_char_decl="no"
+-fi
+-rm -f conftest*
+-ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
+-
+-
+-fi
+-
+-echo "$ac_t""$pac_cv_prog_f77_new_char_decl" 1>&6
+-if test "$pac_cv_prog_f77_new_char_decl" = "yes" ; then
+-    CHARDECL="(LEN=*)"
+-else
+-    CHARDECL="*(*)"
+-fi
+-
++CHARDECL="*(*)"
+ 
+ 
+ checkdir=include
+-echo $ac_n "checking for include directory flag for Fortran""... $ac_c" 1>&6
+-echo "configure:4889: checking for include directory flag for Fortran" >&5
+-if eval "test \"`echo '$''{'pac_cv_prog_f77_has_incdir'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for include directory flag for Fortran" >&5
++echo $ECHO_N "checking for include directory flag for Fortran... $ECHO_C" >&6
++if test "${pac_cv_prog_f77_has_incdir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+ if test ! -d $checkdir ; then mkdir $checkdir ; fi
+ cat >$checkdir/conftestf.h <<EOF
+        call sub()
+@@ -4904,7 +7877,11 @@
+ pac_cv_prog_f77_has_incdir="none"
+ # SGI wants -Wf,-I
+ for idir in "-I" "-Wf,-I" ; do
+-    if { (eval echo configure:4908: \"$ac_fcompiletest\") 1>&5; (eval $ac_fcompiletest) 2>&5; } && test -s conftest.o ; then
++    if { (eval echo "$as_me:$LINENO: \"$ac_fcompiletest\"") >&5
++  (eval $ac_fcompiletest) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest.o ; then
+         pac_cv_prog_f77_has_incdir="$idir"
+ 	break
+     fi
+@@ -4913,17 +7890,17 @@
+ rm -f $checkdir/conftestf.h
+ 
+ fi
+-
+-echo "$ac_t""$pac_cv_prog_f77_has_incdir" 1>&6
++echo "$as_me:$LINENO: result: $pac_cv_prog_f77_has_incdir" >&5
++echo "${ECHO_T}$pac_cv_prog_f77_has_incdir" >&6
+ 
+ if test "X$pac_cv_prog_f77_has_incdir" != "Xnone" ; then
+     F77_INCDIR="$pac_cv_prog_f77_has_incdir"
+ fi
+ 
+ if test -n "$F77_INCDIR" ; then
+-    # For building the Fortran files, add the directory where we are building 
++    # For building the Fortran files, add the directory where we are building
+     # the object to the include list.  This is needed for g77, which makes
+-    # includes relative to the source directory of the file, not the 
++    # includes relative to the source directory of the file, not the
+     # directory that the command is executed in
+     FINCLUDES="$F77_INCDIR`pwd`/src"
+ fi
+@@ -4931,14 +7908,14 @@
+ #
+ 
+ if test "X$F77_LIBDIR_LEADER" = "X" ; then
+-echo $ac_n "checking for Fortran 77 flag for library directories""... $ac_c" 1>&6
+-echo "configure:4936: checking for Fortran 77 flag for library directories" >&5
+-if eval "test \"`echo '$''{'pac_cv_prog_f77_library_dir_flag'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  
+-    
+-    rm -f conftest.* conftest1.* 
++echo "$as_me:$LINENO: checking for Fortran 77 flag for library directories" >&5
++echo $ECHO_N "checking for Fortran 77 flag for library directories... $ECHO_C" >&6
++if test "${pac_cv_prog_f77_library_dir_flag+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++
++    rm -f conftest.* conftest1.*
+     cat > conftest.f <<EOF
+         program main
+         call f1conf
+@@ -4949,13 +7926,35 @@
+         end
+ EOF
+     ac_fcompileforlib='${F77-f77} -c $FFLAGS conftest1.f 1>&5'
+-    if { (eval echo configure:4953: \"$ac_fcompileforlib\") 1>&5; (eval $ac_fcompileforlib) 2>&5; } && test -s conftest1.o ; then
++    if { (eval echo "$as_me:$LINENO: \"$ac_fcompileforlib\"") >&5
++  (eval $ac_fcompileforlib) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest1.o ; then
+         if test ! -d conftest ; then mkdir conftest2 ; fi
+-	        { ac_try='${ARCMD-"ar"} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+-        { ac_try='${RANLIB-ranlib} conftest2/libconftest.a'; { (eval echo configure:4956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
++	# We have had some problems with "AR" set to "ar cr"; this is
++	# a user-error; AR should be set to just the program (plus
++	# any flags that affect the object file format, such as -X64
++	# required for 64-bit objects in some versions of AIX).
++        { ac_try='${AR-"ar"} cr conftest2/libconftest.a conftest1.o'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }
++        { ac_try='${RANLIB-ranlib} conftest2/libconftest.a'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }
+         ac_fcompileldtest='${F77-f77} -o conftest $FFLAGS ${ldir}conftest2 conftest.f -lconftest $LDFLAGS 1>&5'
+         for ldir in "-L" "-Wl,-L," ; do
+-            if { (eval echo configure:4959: \"$ac_fcompileldtest\") 1>&5; (eval $ac_fcompileldtest) 2>&5; } && test -s conftest ; then
++            if { (eval echo "$as_me:$LINENO: \"$ac_fcompileldtest\"") >&5
++  (eval $ac_fcompileldtest) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest ; then
+ 	        pac_cv_prog_f77_library_dir_flag="$ldir"
+ 	        break
+             fi
+@@ -4968,9 +7967,9 @@
+     rm -f conftest*
+ 
+ fi
++echo "$as_me:$LINENO: result: $pac_cv_prog_f77_library_dir_flag" >&5
++echo "${ECHO_T}$pac_cv_prog_f77_library_dir_flag" >&6
+ 
+-echo "$ac_t""$pac_cv_prog_f77_library_dir_flag" 1>&6
+-    
+     if test "X$pac_cv_prog_f77_library_dir_flag" != "X" ; then
+         F77_LIBDIR_LEADER="$pac_cv_prog_f77_library_dir_flag"
+     fi
+@@ -4981,25 +7980,30 @@
+ if test "$MPI_WITH_PMPI" = "no" ; then
+     # If the PMPI routines are not in the same library with the MPI
+     # routines, we may need to remove the pmpi declarations
+-    
+-echo $ac_n "checking whether Fortran allows unused externals""... $ac_c" 1>&6
+-echo "configure:4987: checking whether Fortran allows unused externals" >&5
+-if eval "test \"`echo '$''{'pac_cv_prog_f77_allows_unused_externals'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++
++echo "$as_me:$LINENO: checking whether Fortran allows unused externals" >&5
++echo $ECHO_N "checking whether Fortran allows unused externals... $ECHO_C" >&6
++if test "${pac_cv_prog_f77_allows_unused_externals+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
++
+ 
+ ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+ cat > conftest.$ac_ext <<EOF
+        program main
+        external bar
+        end
+ EOF
+-if { (eval echo configure:5003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   pac_cv_prog_f77_allows_unused_externals="yes"
+ else
+@@ -5007,44 +8011,46 @@
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   pac_cv_prog_f77_allows_unused_externals="no"
+-  
++
+ fi
+ rm -f conftest*
+ #
+ ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+ 
+ fi
+-
+-echo "$ac_t""$pac_cv_prog_f77_allows_unused_externals" 1>&6
++echo "$as_me:$LINENO: result: $pac_cv_prog_f77_allows_unused_externals" >&5
++echo "${ECHO_T}$pac_cv_prog_f77_allows_unused_externals" >&6
+ if test "X$pac_cv_prog_f77_allows_unused_externals" = "Xyes" ; then
+    MPIFPMPI=",PMPI_WTIME,PMPI_WTICK"
+ else
+-   
+-    MPIFPMPI=""; 
+-    echo "configure: warning: Removed PMPI_WTIME and PMPI_WTICK from mpif.h" 1>&2
++
++    MPIFPMPI="";
++    { echo "$as_me:$LINENO: WARNING: Removed PMPI_WTIME and PMPI_WTICK from mpif.h" >&5
++echo "$as_me: WARNING: Removed PMPI_WTIME and PMPI_WTICK from mpif.h" >&2;}
+ fi
+ 
+ else
+     MPIFPMPI=",PMPI_WTIME,PMPI_WTICK"
+ fi
+ 
+-echo $ac_n "checking whether Fortran has pointer declaration""... $ac_c" 1>&6
+-echo "configure:5037: checking whether Fortran has pointer declaration" >&5
+-if eval "test \"`echo '$''{'pac_cv_prog_f77_has_pointer'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking whether Fortran has pointer declaration" >&5
++echo $ECHO_N "checking whether Fortran has pointer declaration... $ECHO_C" >&6
++if test "${pac_cv_prog_f77_has_pointer+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
++
+ 
+ ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+-cat > conftest.$ac_ext <<EOF
++cat >conftest.$ac_ext <<_ACEOF
+       program main
+ 
+         integer M
+@@ -5052,26 +8058,45 @@
+         data MPTR/0/
+ 
+       end
+-EOF
+-if { (eval echo configure:5057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   pac_cv_prog_f77_has_pointer="yes"
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  pac_cv_prog_f77_has_pointer="no"
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++pac_cv_prog_f77_has_pointer="no"
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+ 
+ fi
+-
+-echo "$ac_t""$pac_cv_prog_f77_has_pointer" 1>&6
++echo "$as_me:$LINENO: result: $pac_cv_prog_f77_has_pointer" >&5
++echo "${ECHO_T}$pac_cv_prog_f77_has_pointer" >&6
+ if test "$pac_cv_prog_f77_has_pointer" = "yes" ; then
+     f77_has_pointer=yes
+ else
+@@ -5087,9 +8112,9 @@
+         data MPI_BOTTOM_PTR/0/, MPI_STATUS_IG_PTR/0/
+ 	data MPI_STATUSES_IG_PTR/0/
+ EOF
+-    cat >> confdefs.h <<\EOF
+-#define USE_POINTER_FOR_BOTTOM 1
+-EOF
++    cat >>confdefs.h <<\_ACEOF
++#define USE_POINTER_FOR_BOTTOM 1Define if pointer should be use for MPI_BOTTOM
++_ACEOF
+ 
+         else
+     cat >>include/mpif_bottom.h <<EOF
+@@ -5097,7 +8122,7 @@
+ C
+ C     Without this save, some Fortran implementations may make the common
+ C     dynamic!
+-C    
++C
+ C     For a Fortran90 module, we might replace /MPIPRIV/ with a simple
+ C     SAVE MPI_BOTTOM
+ C
+@@ -5109,12 +8134,12 @@
+ CROSS_F77_SIZEOF_REAL=${CROSS_F77_SIZEOF_REAL:-0}
+ CROSS_F77_SIZEOF_DOUBLE_PRECISION=${CROSS_F77_SIZEOF_PRECISION:-0}
+ 
+-echo $ac_n "checking for size of Fortran type integer""... $ac_c" 1>&6
+-echo "configure:5114: checking for size of Fortran type integer" >&5
+-if eval "test \"`echo '$''{'pac_cv_f77_sizeof_integer'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for size of Fortran type integer" >&5
++echo $ECHO_N "checking for size of Fortran type integer... $ECHO_C" >&6
++if test "${pac_cv_f77_sizeof_integer+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+ 
+ rm -f conftest*
+ cat <<EOF > conftest.f
+@@ -5126,24 +8151,31 @@
+ if test "X$ac_fcompile" = "X" ; then
+     ac_fcompile='${F77-f77} -c $FFLAGS conftest.f 1>&5'
+ fi
+-if { (eval echo configure:5130: \"$ac_fcompile\") 1>&5; (eval $ac_fcompile) 2>&5; } && test -s conftest.o ; then
++if { (eval echo "$as_me:$LINENO: \"$ac_fcompile\"") >&5
++  (eval $ac_fcompile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest.o ; then
+     mv conftest.o conftestf.o
+-    
++
++
+     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+     save_LIBS="$LIBS"
+         LIBS="conftestf.o $FLIBS $LIBS"
+     if test "$cross_compiling" = yes; then
+   eval pac_cv_f77_sizeof_integer=$CROSS_F77_SIZEOF_INTEGER
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 5146 "configure"
+-#include "confdefs.h"
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdio.h>
+ #ifdef F77_NAME_UPPER
+ #define cisize_ CISIZE
+@@ -5156,7 +8188,7 @@
+ void cisize_(char *,char*);
+ void isize_(void);
+ void cisize_(char *i1p, char *i2p)
+-{ 
++{
+    isize_val = (int)(i2p - i1p);
+ }
+ int main(int argc, char **argv)
+@@ -5167,54 +8199,65 @@
+     fprintf(f,"%d\n", isize_val );
+     return 0;
+ }
+-EOF
+-if { (eval echo configure:5172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   eval pac_cv_f77_sizeof_integer=`cat conftestval`
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+-  eval pac_cv_f77_sizeof_integer=0
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++eval pac_cv_f77_sizeof_integer=0
+ fi
+-rm -fr conftest*
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+     # Problem.  If the process fails to run, then there won't be
+     # a good error message.  For example, with one Portland Group
+     # installation, we had problems with finding the libpgc.so shared library
+     # The autoconf code for TRY_RUN doesn't capture the output from
+     # the test program (!)
+-    
++
+     LIBS="$save_LIBS"
+     ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+-else 
++else
+     echo "configure: failed program was:" >&5
+     cat conftest.f >&5
+     eval pac_cv_f77_sizeof_integer=$CROSS_F77_SIZEOF_INTEGER
+ fi
+ 
+ fi
++echo "$as_me:$LINENO: result: $pac_cv_f77_sizeof_integer" >&5
++echo "${ECHO_T}$pac_cv_f77_sizeof_integer" >&6
+ 
+-echo "$ac_t""$pac_cv_f77_sizeof_integer" 1>&6
+-cat >> confdefs.h <<EOF
++cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_F77_INTEGER $pac_cv_f77_sizeof_integer
+-EOF
++_ACEOF
+ 
+ 
+ 
+ 
+ 
+-echo $ac_n "checking for size of Fortran type real""... $ac_c" 1>&6
+-echo "configure:5214: checking for size of Fortran type real" >&5
+-if eval "test \"`echo '$''{'pac_cv_f77_sizeof_real'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for size of Fortran type real" >&5
++echo $ECHO_N "checking for size of Fortran type real... $ECHO_C" >&6
++if test "${pac_cv_f77_sizeof_real+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+ 
+ rm -f conftest*
+ cat <<EOF > conftest.f
+@@ -5226,24 +8269,31 @@
+ if test "X$ac_fcompile" = "X" ; then
+     ac_fcompile='${F77-f77} -c $FFLAGS conftest.f 1>&5'
+ fi
+-if { (eval echo configure:5230: \"$ac_fcompile\") 1>&5; (eval $ac_fcompile) 2>&5; } && test -s conftest.o ; then
++if { (eval echo "$as_me:$LINENO: \"$ac_fcompile\"") >&5
++  (eval $ac_fcompile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest.o ; then
+     mv conftest.o conftestf.o
+-    
++
++
+     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+     save_LIBS="$LIBS"
+         LIBS="conftestf.o $FLIBS $LIBS"
+     if test "$cross_compiling" = yes; then
+   eval pac_cv_f77_sizeof_real=$CROSS_F77_SIZEOF_REAL
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 5246 "configure"
+-#include "confdefs.h"
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdio.h>
+ #ifdef F77_NAME_UPPER
+ #define cisize_ CISIZE
+@@ -5256,7 +8306,7 @@
+ void cisize_(char *,char*);
+ void isize_(void);
+ void cisize_(char *i1p, char *i2p)
+-{ 
++{
+    isize_val = (int)(i2p - i1p);
+ }
+ int main(int argc, char **argv)
+@@ -5267,54 +8317,65 @@
+     fprintf(f,"%d\n", isize_val );
+     return 0;
+ }
+-EOF
+-if { (eval echo configure:5272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   eval pac_cv_f77_sizeof_real=`cat conftestval`
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+-  eval pac_cv_f77_sizeof_real=0
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++eval pac_cv_f77_sizeof_real=0
+ fi
+-rm -fr conftest*
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+     # Problem.  If the process fails to run, then there won't be
+     # a good error message.  For example, with one Portland Group
+     # installation, we had problems with finding the libpgc.so shared library
+     # The autoconf code for TRY_RUN doesn't capture the output from
+     # the test program (!)
+-    
++
+     LIBS="$save_LIBS"
+     ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+-else 
++else
+     echo "configure: failed program was:" >&5
+     cat conftest.f >&5
+     eval pac_cv_f77_sizeof_real=$CROSS_F77_SIZEOF_REAL
+ fi
+ 
+ fi
++echo "$as_me:$LINENO: result: $pac_cv_f77_sizeof_real" >&5
++echo "${ECHO_T}$pac_cv_f77_sizeof_real" >&6
+ 
+-echo "$ac_t""$pac_cv_f77_sizeof_real" 1>&6
+-cat >> confdefs.h <<EOF
++cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_F77_REAL $pac_cv_f77_sizeof_real
+-EOF
++_ACEOF
+ 
+ 
+ 
+ 
+ 
+-echo $ac_n "checking for size of Fortran type double precision""... $ac_c" 1>&6
+-echo "configure:5314: checking for size of Fortran type double precision" >&5
+-if eval "test \"`echo '$''{'pac_cv_f77_sizeof_double_precision'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for size of Fortran type double precision" >&5
++echo $ECHO_N "checking for size of Fortran type double precision... $ECHO_C" >&6
++if test "${pac_cv_f77_sizeof_double_precision+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+ 
+ rm -f conftest*
+ cat <<EOF > conftest.f
+@@ -5326,24 +8387,31 @@
+ if test "X$ac_fcompile" = "X" ; then
+     ac_fcompile='${F77-f77} -c $FFLAGS conftest.f 1>&5'
+ fi
+-if { (eval echo configure:5330: \"$ac_fcompile\") 1>&5; (eval $ac_fcompile) 2>&5; } && test -s conftest.o ; then
++if { (eval echo "$as_me:$LINENO: \"$ac_fcompile\"") >&5
++  (eval $ac_fcompile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest.o ; then
+     mv conftest.o conftestf.o
+-    
++
++
+     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+     save_LIBS="$LIBS"
+         LIBS="conftestf.o $FLIBS $LIBS"
+     if test "$cross_compiling" = yes; then
+   eval pac_cv_f77_sizeof_double_precision=$CROSS_F77_SIZEOF_DOUBLE_PRECISION
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 5346 "configure"
+-#include "confdefs.h"
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdio.h>
+ #ifdef F77_NAME_UPPER
+ #define cisize_ CISIZE
+@@ -5356,7 +8424,7 @@
+ void cisize_(char *,char*);
+ void isize_(void);
+ void cisize_(char *i1p, char *i2p)
+-{ 
++{
+    isize_val = (int)(i2p - i1p);
+ }
+ int main(int argc, char **argv)
+@@ -5367,43 +8435,54 @@
+     fprintf(f,"%d\n", isize_val );
+     return 0;
+ }
+-EOF
+-if { (eval echo configure:5372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   eval pac_cv_f77_sizeof_double_precision=`cat conftestval`
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+-  eval pac_cv_f77_sizeof_double_precision=0
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++eval pac_cv_f77_sizeof_double_precision=0
+ fi
+-rm -fr conftest*
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+     # Problem.  If the process fails to run, then there won't be
+     # a good error message.  For example, with one Portland Group
+     # installation, we had problems with finding the libpgc.so shared library
+     # The autoconf code for TRY_RUN doesn't capture the output from
+     # the test program (!)
+-    
++
+     LIBS="$save_LIBS"
+     ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+-else 
++else
+     echo "configure: failed program was:" >&5
+     cat conftest.f >&5
+     eval pac_cv_f77_sizeof_double_precision=$CROSS_F77_SIZEOF_DOUBLE_PRECISION
+ fi
+ 
+ fi
++echo "$as_me:$LINENO: result: $pac_cv_f77_sizeof_double_precision" >&5
++echo "${ECHO_T}$pac_cv_f77_sizeof_double_precision" >&6
+ 
+-echo "$ac_t""$pac_cv_f77_sizeof_double_precision" 1>&6
+-cat >> confdefs.h <<EOF
++cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_F77_DOUBLE_PRECISION $pac_cv_f77_sizeof_double_precision
+-EOF
++_ACEOF
+ 
+ 
+ 
+@@ -5411,179 +8490,374 @@
+ # If we have sizes for real and double, we do not need to call mpir_get_fsize
+ # at run time.
+ #
+-cat > conftest.$ac_ext <<EOF
++cat >conftest.$ac_ext <<_ACEOF
+       program main
+       integer*1 i
+       end
+-EOF
+-if { (eval echo configure:5420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   has_integer_1=1
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  has_integer_1=0
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++has_integer_1=0
+ fi
+-rm -f conftest*
+-cat > conftest.$ac_ext <<EOF
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++cat >conftest.$ac_ext <<_ACEOF
+       program main
+       integer*2 i
+       end
+-EOF
+-if { (eval echo configure:5435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   has_integer_2=2
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  has_integer_2=0
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++has_integer_2=0
+ fi
+-rm -f conftest*
+-cat > conftest.$ac_ext <<EOF
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++cat >conftest.$ac_ext <<_ACEOF
+       program main
+       integer*4 i
+       end
+-EOF
+-if { (eval echo configure:5450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   has_integer_4=4
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  has_integer_4=0
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++has_integer_4=0
+ fi
+-rm -f conftest*
+-cat > conftest.$ac_ext <<EOF
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++cat >conftest.$ac_ext <<_ACEOF
+       program main
+       integer*8 i
+       end
+-EOF
+-if { (eval echo configure:5465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   has_integer_8=8
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  has_integer_8=0
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++has_integer_8=0
+ fi
+-rm -f conftest*
+-cat > conftest.$ac_ext <<EOF
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++cat >conftest.$ac_ext <<_ACEOF
+       program main
+       integer*16 i
+       end
+-EOF
+-if { (eval echo configure:5480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   has_integer_16=16
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  has_integer_16=0
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++has_integer_16=0
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-cat > conftest.$ac_ext <<EOF
++cat >conftest.$ac_ext <<_ACEOF
+       program main
+       real*4 a
+       end
+-EOF
+-if { (eval echo configure:5496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   has_real_4=4
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  has_real_4=0
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++has_real_4=0
+ fi
+-rm -f conftest*
+-cat > conftest.$ac_ext <<EOF
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++cat >conftest.$ac_ext <<_ACEOF
+       program main
+       real*8 a
+       end
+-EOF
+-if { (eval echo configure:5511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   has_real_8=8
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  has_real_8=0
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++has_real_8=0
+ fi
+-rm -f conftest*
+-cat > conftest.$ac_ext <<EOF
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++cat >conftest.$ac_ext <<_ACEOF
+       program main
+       real*16 a
+       end
+-EOF
+-if { (eval echo configure:5526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   has_real_16=16
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  has_real_16=0
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++has_real_16=0
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ # Compare the sizes of these types to the C types
+ 
+ ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:5549: checking for ANSI C header files" >&5
+-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6
++if test "${ac_cv_prog_egrep+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 5554 "configure"
+-#include "confdefs.h"
++  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++    then ac_cv_prog_egrep='grep -E'
++    else ac_cv_prog_egrep='egrep'
++    fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
++echo "${ECHO_T}$ac_cv_prog_egrep" >&6
++ EGREP=$ac_cv_prog_egrep
++
++
++echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++if test "${ac_cv_header_stdc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
+ #include <float.h>
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+-if test -z "$ac_err"; then
+-  rm -rf conftest*
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   ac_cv_header_stdc=yes
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  ac_cv_header_stdc=no
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_header_stdc=no
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+-cat > conftest.$ac_ext <<EOF
+-#line 5579 "configure"
+-#include "confdefs.h"
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <string.h>
+-EOF
++
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "memchr" >/dev/null 2>&1; then
++  $EGREP "memchr" >/dev/null 2>&1; then
+   :
+ else
+-  rm -rf conftest*
+   ac_cv_header_stdc=no
+ fi
+ rm -f conftest*
+@@ -5592,16 +8866,19 @@
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+-cat > conftest.$ac_ext <<EOF
+-#line 5597 "configure"
+-#include "confdefs.h"
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdlib.h>
+-EOF
++
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "free" >/dev/null 2>&1; then
++  $EGREP "free" >/dev/null 2>&1; then
+   :
+ else
+-  rm -rf conftest*
+   ac_cv_header_stdc=no
+ fi
+ rm -f conftest*
+@@ -5610,83 +8887,135 @@
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+-if test "$cross_compiling" = yes; then
++  if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 5618 "configure"
+-#include "confdefs.h"
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <ctype.h>
+-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+-int main () { int i; for (i = 0; i < 256; i++)
+-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+-exit (0); }
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#else
++# define ISLOWER(c) \
++		   (('a' <= (c) && (c) <= 'i') \
++		     || ('j' <= (c) && (c) <= 'r') \
++		     || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
++#endif
+ 
+-EOF
+-if { (eval echo configure:5629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++int
++main ()
++{
++  int i;
++  for (i = 0; i < 256; i++)
++    if (XOR (islower (i), ISLOWER (i))
++	|| toupper (i) != TOUPPER (i))
++      exit(2);
++  exit (0);
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   :
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+-  ac_cv_header_stdc=no
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_header_stdc=no
+ fi
+-rm -fr conftest*
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ fi
+ fi
+-
+-echo "$ac_t""$ac_cv_header_stdc" 1>&6
++echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+-  cat >> confdefs.h <<\EOF
++
++cat >>confdefs.h <<\_ACEOF
+ #define STDC_HEADERS 1
+-EOF
++_ACEOF
+ 
+ fi
+ 
+-for ac_hdr in stdlib.h string.h
++
++
++for ac_header in stdlib.h string.h
+ do
+-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5656: checking for $ac_hdr" >&5
+-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'`
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+ pac_found_header=no
+ if test "$CPP" != "/lib/cpp" ; then
+-    cat > conftest.$ac_ext <<EOF
+-#line 5664 "configure"
+-#include "confdefs.h"
+-#include <$ac_hdr>
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+-if test -z "$ac_err"; then
+-  rm -rf conftest*
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
+   pac_found_header=yes
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_ext
+ fi
+ # If cpp failed, see if the compiler accepts the header.
+ if test "$pac_found_header" != "yes" ; then
+     cat >conftest.c<<EOF
+-#line 5684 "configure"
++#line 9008 "configure"
+ #include "confdefs.h"
+-#include <$ac_hdr>
++#include <$ac_header>
+ int conftest() {return 0;}
+ EOF
+     ac_compile_for_cpp='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
+-    if { (eval echo configure:5690: \"$ac_compile_for_cpp\") 1>&5; (eval $ac_compile_for_cpp) 2>&5; }; then
++    if { (eval echo "$as_me:$LINENO: \"$ac_compile_for_cpp\"") >&5
++  (eval $ac_compile_for_cpp) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
+ 	pac_found_header=yes
+     else
+         echo "configure: failed program was:" >&5
+@@ -5703,58 +9032,80 @@
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+-  cat >> confdefs.h <<EOF
+-#define $ac_tr_hdr 1
+-EOF
+- 
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++  cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ done
+ 
+ # Current bug: this is needed for mpi.h, which should eventually remove
+-#   the ifdef test on USE_STDARG 
++#   the ifdef test on USE_STDARG
+ # It is also used in the definition of MPIR_Err_setmsg.
+ 
+ ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6
+-echo "configure:5724: checking for stdarg.h" >&5
+-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for stdarg.h" >&5
++echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6
++if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+ pac_found_header=no
+ if test "$CPP" != "/lib/cpp" ; then
+-    cat > conftest.$ac_ext <<EOF
+-#line 5732 "configure"
+-#include "confdefs.h"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdarg.h>
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+-if test -z "$ac_err"; then
+-  rm -rf conftest*
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
+   pac_found_header=yes
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_ext
+ fi
+ # If cpp failed, see if the compiler accepts the header.
+ if test "$pac_found_header" != "yes" ; then
+     cat >conftest.c<<EOF
+-#line 5752 "configure"
++#line 9098 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ int conftest() {return 0;}
+ EOF
+     ac_compile_for_cpp='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
+-    if { (eval echo configure:5758: \"$ac_compile_for_cpp\") 1>&5; (eval $ac_compile_for_cpp) 2>&5; }; then
++    if { (eval echo "$as_me:$LINENO: \"$ac_compile_for_cpp\"") >&5
++  (eval $ac_compile_for_cpp) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
+ 	pac_found_header=yes
+     else
+         echo "configure: failed program was:" >&5
+@@ -5771,31 +9122,34 @@
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+   :
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+ if test "$ac_cv_header_stdarg_h" = "yes" ; then
+-        echo $ac_n "checking whether stdarg is oldstyle""... $ac_c" 1>&6
+-echo "configure:5783: checking whether stdarg is oldstyle" >&5
+-if eval "test \"`echo '$''{'pac_cv_header_stdarg_oldstyle'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++        echo "$as_me:$LINENO: checking whether stdarg is oldstyle" >&5
++echo $ECHO_N "checking whether stdarg is oldstyle... $ECHO_C" >&6
++if test "${pac_cv_header_stdarg_oldstyle+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+ 
+ pac_check_compile=2
+ if test -z "$pac_TRY_COMPLILE_CLEAN" ; then
+     rm -f conftest*
+     echo 'int try(void);int try(void){return 0;}' > conftest.c
+     if ${CC-cc} $CFLAGS -c conftest.c >conftest.bas 2>&1 ; then
+-	if test -s conftest.bas ; then 
++	if test -s conftest.bas ; then
+ 	    pac_TRY_COMPILE_CLEAN_OUT=`cat conftest.bas`
+         fi
+         pac_TRY_COMPILE_CLEAN=1
+     else
+-	echo "configure: warning: Could not compile simple test program!" 1>&2
++	{ echo "$as_me:$LINENO: WARNING: Could not compile simple test program!" >&5
++echo "$as_me: WARNING: Could not compile simple test program!" >&2;}
+ 	if test -s conftest.bas ; then 	cat conftest.bas >> config.log ; fi
+     fi
+ fi
+@@ -5831,7 +9185,7 @@
+ fi
+ rm -f conftest*
+ 
+-case "$pac_check_compile" in 
++case "$pac_check_compile" in
+     0)  pac_cv_header_stdarg_oldstyle="yes"
+ 	;;
+     1)  pac_cv_header_stdarg_oldstyle="may be newstyle"
+@@ -5841,32 +9195,34 @@
+ esac
+ 
+ fi
+-
+-echo "$ac_t""$pac_cv_header_stdarg_oldstyle" 1>&6
++echo "$as_me:$LINENO: result: $pac_cv_header_stdarg_oldstyle" >&5
++echo "${ECHO_T}$pac_cv_header_stdarg_oldstyle" >&6
+ if test "$pac_cv_header_stdarg_oldstyle" = "yes" ; then
+-    cat >> confdefs.h <<\EOF
++
++cat >>confdefs.h <<\_ACEOF
+ #define USE_OLDSTYLE_STDARG 1
+-EOF
++_ACEOF
+ 
+ else
+-    echo $ac_n "checking whether stdarg works""... $ac_c" 1>&6
+-echo "configure:5854: checking whether stdarg works" >&5
+-if eval "test \"`echo '$''{'pac_cv_header_stdarg_works'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++    echo "$as_me:$LINENO: checking whether stdarg works" >&5
++echo $ECHO_N "checking whether stdarg works... $ECHO_C" >&6
++if test "${pac_cv_header_stdarg_works+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
+-    
++
++
+ pac_check_compile=2
+ if test -z "$pac_TRY_COMPLILE_CLEAN" ; then
+     rm -f conftest*
+     echo 'int try(void);int try(void){return 0;}' > conftest.c
+     if ${CC-cc} $CFLAGS -c conftest.c >conftest.bas 2>&1 ; then
+-	if test -s conftest.bas ; then 
++	if test -s conftest.bas ; then
+ 	    pac_TRY_COMPILE_CLEAN_OUT=`cat conftest.bas`
+         fi
+         pac_TRY_COMPILE_CLEAN=1
+     else
+-	echo "configure: warning: Could not compile simple test program!" 1>&2
++	{ echo "$as_me:$LINENO: WARNING: Could not compile simple test program!" >&5
++echo "$as_me: WARNING: Could not compile simple test program!" >&2;}
+ 	if test -s conftest.bas ; then 	cat conftest.bas >> config.log ; fi
+     fi
+ fi
+@@ -5904,7 +9260,7 @@
+ fi
+ rm -f conftest*
+ 
+-case "$pac_check_compile" in 
++case "$pac_check_compile" in
+     0)  pac_cv_header_stdarg_works="yes"
+ 	;;
+     1)  pac_cv_header_stdarg_works="yes with warnings"
+@@ -5914,18 +9270,19 @@
+ esac
+ 
+ fi
+-
+-echo "$ac_t""$pac_cv_header_stdarg_works" 1>&6
++echo "$as_me:$LINENO: result: $pac_cv_header_stdarg_works" >&5
++echo "${ECHO_T}$pac_cv_header_stdarg_works" >&6
+ fi   # test on oldstyle
+ if test "$pac_cv_header_stdarg_works" = "no" ; then
+     :
+ else
+-    cat >> confdefs.h <<\EOF
++
++cat >>confdefs.h <<\_ACEOF
+ #define USE_STDARG 1
+-EOF
++_ACEOF
+ 
+ fi
+-else 
++else
+     :
+ fi  # test on header
+ 
+@@ -5943,356 +9300,3759 @@
+ CROSS_OFFSET_KIND=${CROSS_OFFSET_KIND:-0}
+ CROSS_ADDRESS_KIND=${CROSS_ADDRESS_KIND:-0}
+ 
+-echo $ac_n "checking size of char""... $ac_c" 1>&6
+-echo "configure:5948: checking size of char" >&5
+-if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++
++
++
++
++
++
++
++
++
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h
++do
++ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%'`
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$cross_compiling" = yes; then
+-  ac_cv_sizeof_char=$CROSS_SIZEOF_CHAR
++
++pac_found_header=no
++if test "$CPP" != "/lib/cpp" ; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 5956 "configure"
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  pac_found_header=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++rm -f conftest.err conftest.$ac_ext
++fi
++# If cpp failed, see if the compiler accepts the header.
++if test "$pac_found_header" != "yes" ; then
++    cat >conftest.c<<EOF
++#line 9363 "configure"
+ #include "confdefs.h"
++#include <$ac_header>
++int conftest() {return 0;}
++EOF
++    ac_compile_for_cpp='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
++    if { (eval echo "$as_me:$LINENO: \"$ac_compile_for_cpp\"") >&5
++  (eval $ac_compile_for_cpp) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++	pac_found_header=yes
++    else
++        echo "configure: failed program was:" >&5
++        cat conftest.c >&5
++    fi
++    rm -f conftest*
++fi
++# Finally, set the ac variable.
++if test "$pac_found_header" = "yes" ; then
++    eval "ac_cv_header_$ac_safe=yes"
++else
++    eval "ac_cv_header_$ac_safe=no"
++fi
++
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++  cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++done
++
++
++echo "$as_me:$LINENO: checking for char" >&5
++echo $ECHO_N "checking for char... $ECHO_C" >&6
++if test "${ac_cv_type_char+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((char *) 0)
++  return 0;
++if (sizeof (char))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_char=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_char=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
++echo "${ECHO_T}$ac_cv_type_char" >&6
++
++echo "$as_me:$LINENO: checking size of char" >&5
++echo $ECHO_N "checking size of char... $ECHO_C" >&6
++if test "${ac_cv_sizeof_char+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_char" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (char))) >= 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_char=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (char), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (char)); }
++unsigned long ulongval () { return (long) (sizeof (char)); }
+ #include <stdio.h>
+-main()
++#include <stdlib.h>
++int
++main ()
+ {
+-  FILE *f=fopen("conftestval", "w");
+-  if (!f) exit(1);
+-  fprintf(f, "%d\n", sizeof(char));
+-  exit(0);
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (char))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (char))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (char))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
+ }
+-EOF
+-if { (eval echo configure:5967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
+-  ac_cv_sizeof_char=`cat conftestval`
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_char=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (char), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+   ac_cv_sizeof_char=0
+ fi
+-rm -fr conftest*
+ fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
++echo "${ECHO_T}$ac_cv_sizeof_char" >&6
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_CHAR $ac_cv_sizeof_char
++_ACEOF
++
++
++echo "$as_me:$LINENO: checking for short" >&5
++echo $ECHO_N "checking for short... $ECHO_C" >&6
++if test "${ac_cv_type_short+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((short *) 0)
++  return 0;
++if (sizeof (short))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_short=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_short=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
++echo "${ECHO_T}$ac_cv_type_short" >&6
++
++echo "$as_me:$LINENO: checking size of short" >&5
++echo $ECHO_N "checking size of short... $ECHO_C" >&6
++if test "${ac_cv_sizeof_short+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_short" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
++test_array [0] = 0
+ 
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-echo "$ac_t""$ac_cv_sizeof_char" 1>&6
+-cat >> confdefs.h <<EOF
+-#define SIZEOF_CHAR $ac_cv_sizeof_char
+-EOF
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
++test_array [0] = 0
+ 
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
++test_array [0] = 0
+ 
+-echo $ac_n "checking size of short""... $ac_c" 1>&6
+-echo "configure:5987: checking size of short" >&5
+-if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
+ else
+-  if test "$cross_compiling" = yes; then
+-  ac_cv_sizeof_short=$CROSS_SIZEOF_SHORT
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 5995 "configure"
+-#include "confdefs.h"
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_short=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (short), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (short)); }
++unsigned long ulongval () { return (long) (sizeof (short)); }
+ #include <stdio.h>
+-main()
++#include <stdlib.h>
++int
++main ()
+ {
+-  FILE *f=fopen("conftestval", "w");
+-  if (!f) exit(1);
+-  fprintf(f, "%d\n", sizeof(short));
+-  exit(0);
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (short))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (short))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (short))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
+ }
+-EOF
+-if { (eval echo configure:6006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
+-  ac_cv_sizeof_short=`cat conftestval`
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_short=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (short), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+   ac_cv_sizeof_short=0
+ fi
+-rm -fr conftest*
+ fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
++echo "${ECHO_T}$ac_cv_sizeof_short" >&6
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_SHORT $ac_cv_sizeof_short
++_ACEOF
++
+ 
++echo "$as_me:$LINENO: checking for int" >&5
++echo $ECHO_N "checking for int... $ECHO_C" >&6
++if test "${ac_cv_type_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((int *) 0)
++  return 0;
++if (sizeof (int))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_int=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_int=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
++echo "${ECHO_T}$ac_cv_type_int" >&6
++
++echo "$as_me:$LINENO: checking size of int" >&5
++echo $ECHO_N "checking size of int... $ECHO_C" >&6
++if test "${ac_cv_sizeof_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_int" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-echo "$ac_t""$ac_cv_sizeof_short" 1>&6
+-cat >> confdefs.h <<EOF
+-#define SIZEOF_SHORT $ac_cv_sizeof_short
+-EOF
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
++test_array [0] = 0
+ 
+-echo $ac_n "checking size of int""... $ac_c" 1>&6
+-echo "configure:6026: checking size of int" >&5
+-if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
+ else
+-  if test "$cross_compiling" = yes; then
+-  ac_cv_sizeof_int=$CROSS_SIZEOF_INT
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 6034 "configure"
+-#include "confdefs.h"
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_int=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (int)); }
++unsigned long ulongval () { return (long) (sizeof (int)); }
+ #include <stdio.h>
+-main()
++#include <stdlib.h>
++int
++main ()
+ {
+-  FILE *f=fopen("conftestval", "w");
+-  if (!f) exit(1);
+-  fprintf(f, "%d\n", sizeof(int));
+-  exit(0);
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (int))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (int))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (int))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
+ }
+-EOF
+-if { (eval echo configure:6045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
+-  ac_cv_sizeof_int=`cat conftestval`
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_int=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+   ac_cv_sizeof_int=0
+ fi
+-rm -fr conftest*
+ fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_int" >&6
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_INT $ac_cv_sizeof_int
++_ACEOF
++
++
++echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6
++if test "${ac_cv_type_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((long *) 0)
++  return 0;
++if (sizeof (long))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_long=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_long=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6
++
++echo "$as_me:$LINENO: checking size of long" >&5
++echo $ECHO_N "checking size of long... $ECHO_C" >&6
++if test "${ac_cv_sizeof_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_long" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_long=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (long)); }
++unsigned long ulongval () { return (long) (sizeof (long)); }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (long))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (long))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (long))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_long=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_long=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG $ac_cv_sizeof_long
++_ACEOF
++
++
++echo "$as_me:$LINENO: checking for long long" >&5
++echo $ECHO_N "checking for long long... $ECHO_C" >&6
++if test "${ac_cv_type_long_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((long long *) 0)
++  return 0;
++if (sizeof (long long))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_long_long=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_long_long=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
++echo "${ECHO_T}$ac_cv_type_long_long" >&6
++
++echo "$as_me:$LINENO: checking size of long long" >&5
++echo $ECHO_N "checking size of long long... $ECHO_C" >&6
++if test "${ac_cv_sizeof_long_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_long_long" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_long_long=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long long), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (long long)); }
++unsigned long ulongval () { return (long) (sizeof (long long)); }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (long long))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (long long))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (long long))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_long_long=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long long), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_long_long=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
++_ACEOF
++
++
++echo "$as_me:$LINENO: checking for float" >&5
++echo $ECHO_N "checking for float... $ECHO_C" >&6
++if test "${ac_cv_type_float+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((float *) 0)
++  return 0;
++if (sizeof (float))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_float=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_float=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_float" >&5
++echo "${ECHO_T}$ac_cv_type_float" >&6
++
++echo "$as_me:$LINENO: checking size of float" >&5
++echo $ECHO_N "checking size of float... $ECHO_C" >&6
++if test "${ac_cv_sizeof_float+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_float" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (float))) >= 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (float))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (float))) < 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (float))) >= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (float))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_float=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (float), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (float), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (float)); }
++unsigned long ulongval () { return (long) (sizeof (float)); }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (float))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (float))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (float))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_float=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (float), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (float), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_float=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5
++echo "${ECHO_T}$ac_cv_sizeof_float" >&6
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_FLOAT $ac_cv_sizeof_float
++_ACEOF
++
++
++echo "$as_me:$LINENO: checking for double" >&5
++echo $ECHO_N "checking for double... $ECHO_C" >&6
++if test "${ac_cv_type_double+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((double *) 0)
++  return 0;
++if (sizeof (double))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_double=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_double=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
++echo "${ECHO_T}$ac_cv_type_double" >&6
++
++echo "$as_me:$LINENO: checking size of double" >&5
++echo $ECHO_N "checking size of double... $ECHO_C" >&6
++if test "${ac_cv_sizeof_double+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_double" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (double))) >= 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (double))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (double))) < 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (double))) >= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
++ac_lo= ac_hi=
+ fi
+-echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+-cat >> confdefs.h <<EOF
+-#define SIZEOF_INT $ac_cv_sizeof_int
+-EOF
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (double))) <= $ac_mid)];
++test_array [0] = 0
+ 
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-echo $ac_n "checking size of long""... $ac_c" 1>&6
+-echo "configure:6065: checking size of long" >&5
+-if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_double=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (double), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (double), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
+ else
+   if test "$cross_compiling" = yes; then
+-  ac_cv_sizeof_long=$CROSS_SIZEOF_LONG
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 6073 "configure"
+-#include "confdefs.h"
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (double)); }
++unsigned long ulongval () { return (long) (sizeof (double)); }
+ #include <stdio.h>
+-main()
++#include <stdlib.h>
++int
++main ()
+ {
+-  FILE *f=fopen("conftestval", "w");
+-  if (!f) exit(1);
+-  fprintf(f, "%d\n", sizeof(long));
+-  exit(0);
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (double))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (double))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (double))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
+ }
+-EOF
+-if { (eval echo configure:6084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
+-  ac_cv_sizeof_long=`cat conftestval`
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+-  ac_cv_sizeof_long=0
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_double=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (double), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (double), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
+ fi
+-rm -fr conftest*
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ fi
+-echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+-cat >> confdefs.h <<EOF
+-#define SIZEOF_LONG $ac_cv_sizeof_long
+-EOF
++rm -f conftest.val
++else
++  ac_cv_sizeof_double=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
++echo "${ECHO_T}$ac_cv_sizeof_double" >&6
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_DOUBLE $ac_cv_sizeof_double
++_ACEOF
+ 
+ 
+-echo $ac_n "checking size of long long""... $ac_c" 1>&6
+-echo "configure:6104: checking size of long long" >&5
+-if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
++echo "$as_me:$LINENO: checking for long double" >&5
++echo $ECHO_N "checking for long double... $ECHO_C" >&6
++if test "${ac_cv_type_long_double+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((long double *) 0)
++  return 0;
++if (sizeof (long double))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_long_double=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_long_double=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_long_double" >&5
++echo "${ECHO_T}$ac_cv_type_long_double" >&6
++
++echo "$as_me:$LINENO: checking size of long double" >&5
++echo $ECHO_N "checking size of long double... $ECHO_C" >&6
++if test "${ac_cv_sizeof_long_double+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_long_double" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+-  ac_cv_sizeof_long_long=$CROSS_SIZEOF_LONG_LONG
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 6112 "configure"
+-#include "confdefs.h"
+-#include <stdio.h>
+-main()
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
+ {
+-  FILE *f=fopen("conftestval", "w");
+-  if (!f) exit(1);
+-  fprintf(f, "%d\n", sizeof(long long));
+-  exit(0);
++static int test_array [1 - 2 * !(((long) (sizeof (long double))) >= 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
+ }
+-EOF
+-if { (eval echo configure:6123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
+-  ac_cv_sizeof_long_long=`cat conftestval`
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+-  ac_cv_sizeof_long_long=0
+-fi
+-rm -fr conftest*
+-fi
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long double))) <= $ac_mid)];
++test_array [0] = 0
+ 
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
+-cat >> confdefs.h <<EOF
+-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+-EOF
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long double))) < 0)];
++test_array [0] = 0
+ 
+-echo $ac_n "checking size of float""... $ac_c" 1>&6
+-echo "configure:6143: checking size of float" >&5
+-if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test "$cross_compiling" = yes; then
+-  ac_cv_sizeof_float=$CROSS_SIZEOF_FLOAT
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 6151 "configure"
+-#include "confdefs.h"
+-#include <stdio.h>
+-main()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
+ {
+-  FILE *f=fopen("conftestval", "w");
+-  if (!f) exit(1);
+-  fprintf(f, "%d\n", sizeof(float));
+-  exit(0);
++static int test_array [1 - 2 * !(((long) (sizeof (long double))) >= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
+ }
+-EOF
+-if { (eval echo configure:6162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
+-  ac_cv_sizeof_float=`cat conftestval`
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+-  ac_cv_sizeof_float=0
+-fi
+-rm -fr conftest*
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
+ fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
++ac_lo= ac_hi=
+ fi
+-echo "$ac_t""$ac_cv_sizeof_float" 1>&6
+-cat >> confdefs.h <<EOF
+-#define SIZEOF_FLOAT $ac_cv_sizeof_float
+-EOF
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long double))) <= $ac_mid)];
++test_array [0] = 0
+ 
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-echo $ac_n "checking size of double""... $ac_c" 1>&6
+-echo "configure:6182: checking size of double" >&5
+-if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_long_double=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long double), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long double), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
+ else
+   if test "$cross_compiling" = yes; then
+-  ac_cv_sizeof_double=$CROSS_SIZEOF_DOUBLE
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 6190 "configure"
+-#include "confdefs.h"
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (long double)); }
++unsigned long ulongval () { return (long) (sizeof (long double)); }
+ #include <stdio.h>
+-main()
++#include <stdlib.h>
++int
++main ()
+ {
+-  FILE *f=fopen("conftestval", "w");
+-  if (!f) exit(1);
+-  fprintf(f, "%d\n", sizeof(double));
+-  exit(0);
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (long double))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (long double))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (long double))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
+ }
+-EOF
+-if { (eval echo configure:6201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
+-  ac_cv_sizeof_double=`cat conftestval`
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+-  ac_cv_sizeof_double=0
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_long_double=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long double), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long double), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
+ fi
+-rm -fr conftest*
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ fi
+-echo "$ac_t""$ac_cv_sizeof_double" 1>&6
+-cat >> confdefs.h <<EOF
+-#define SIZEOF_DOUBLE $ac_cv_sizeof_double
+-EOF
++rm -f conftest.val
++else
++  ac_cv_sizeof_long_double=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_double" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long_double" >&6
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double
++_ACEOF
+ 
+ 
+-echo $ac_n "checking size of long double""... $ac_c" 1>&6
+-echo "configure:6221: checking size of long double" >&5
+-if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
++# sizeof(void*) is needed for ADDRESS_KIND below
++echo "$as_me:$LINENO: checking for void*" >&5
++echo $ECHO_N "checking for void*... $ECHO_C" >&6
++if test "${ac_cv_type_voidp+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((void* *) 0)
++  return 0;
++if (sizeof (void*))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_voidp=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_voidp=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_voidp" >&5
++echo "${ECHO_T}$ac_cv_type_voidp" >&6
++
++echo "$as_me:$LINENO: checking size of void*" >&5
++echo $ECHO_N "checking size of void*... $ECHO_C" >&6
++if test "${ac_cv_sizeof_voidp+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_voidp" = yes; then
++  # The cast to unsigned long works around a bug in the HP C Compiler
++  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+-  ac_cv_sizeof_long_double=$CROSS_SIZEOF_LONG_DOUBLE
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 6229 "configure"
+-#include "confdefs.h"
+-#include <stdio.h>
+-main()
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
+ {
+-  FILE *f=fopen("conftestval", "w");
+-  if (!f) exit(1);
+-  fprintf(f, "%d\n", sizeof(long double));
+-  exit(0);
++static int test_array [1 - 2 * !(((long) (sizeof (void*))) >= 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
+ }
+-EOF
+-if { (eval echo configure:6240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
+-  ac_cv_sizeof_long_double=`cat conftestval`
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+-  ac_cv_sizeof_long_double=0
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (void*))) <= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -fr conftest*
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (void*))) < 0)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (void*))) >= $ac_mid)];
++test_array [0] = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
+ fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
++ac_lo= ac_hi=
+ fi
+-echo "$ac_t""$ac_cv_sizeof_long_double" 1>&6
+-cat >> confdefs.h <<EOF
+-#define SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double
+-EOF
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (void*))) <= $ac_mid)];
++test_array [0] = 0
+ 
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# sizeof(void*) is needed for ADDRESS_KIND below
+-echo $ac_n "checking size of void*""... $ac_c" 1>&6
+-echo "configure:6261: checking size of void*" >&5
+-if eval "test \"`echo '$''{'ac_cv_sizeof_voidp'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_voidp=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void*), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (void*), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
+ else
+   if test "$cross_compiling" = yes; then
+-  ac_cv_sizeof_voidp=$CROSS_SIZEOF_VOID_P
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 6269 "configure"
+-#include "confdefs.h"
++  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
++echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++long longval () { return (long) (sizeof (void*)); }
++unsigned long ulongval () { return (long) (sizeof (void*)); }
+ #include <stdio.h>
+-main()
++#include <stdlib.h>
++int
++main ()
+ {
+-  FILE *f=fopen("conftestval", "w");
+-  if (!f) exit(1);
+-  fprintf(f, "%d\n", sizeof(void*));
+-  exit(0);
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (void*))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (void*))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (void*))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
+ }
+-EOF
+-if { (eval echo configure:6280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
+-  ac_cv_sizeof_voidp=`cat conftestval`
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_voidp=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void*), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (void*), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+   ac_cv_sizeof_voidp=0
+ fi
+-rm -fr conftest*
+-fi
+-
+ fi
+-echo "$ac_t""$ac_cv_sizeof_voidp" 1>&6
+-cat >> confdefs.h <<EOF
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5
++echo "${ECHO_T}$ac_cv_sizeof_voidp" >&6
++cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_VOIDP $ac_cv_sizeof_voidp
+-EOF
++_ACEOF
+ 
+ 
+ 
+@@ -6319,19 +13079,21 @@
+     eval testval=\$"has_integer_$len"
+     if test "$testval" = 0 ; then continue ; fi
+     noval="yes"
+-    echo $ac_n "checking for C type matching Fortran integer*$len""... $ac_c" 1>&6
+-echo "configure:6324: checking for C type matching Fortran integer*$len" >&5
++    echo "$as_me:$LINENO: checking for C type matching Fortran integer*$len" >&5
++echo $ECHO_N "checking for C type matching Fortran integer*$len... $ECHO_C" >&6
+     for c_type in char short int long "long_long" ; do
+ 	eval ctypelen=\$"ac_cv_sizeof_$c_type"
+ 	if test "$testval" = "$ctypelen" -a "$ctypelen" -gt 0 ; then
+-	    echo "$ac_t""$c_type" 1>&6
++	    echo "$as_me:$LINENO: result: $c_type" >&5
++echo "${ECHO_T}$c_type" >&6
+ 	    eval F77_INT$len=\$"${c_type}_mpi"
+ 	    noval="no"
+ 	    break
+         fi
+     done
+     if test "$noval" = "yes" ; then
+-        echo "$ac_t""unavailable" 1>&6
++        echo "$as_me:$LINENO: result: unavailable" >&5
++echo "${ECHO_T}unavailable" >&6
+     fi
+ done
+ 
+@@ -6343,12 +13105,13 @@
+     eval testval=\$"has_real_$len"
+     if test "$testval" = 0 ; then continue ; fi
+     noval="yes"
+-    echo $ac_n "checking for C type matching Fortran real*$len""... $ac_c" 1>&6
+-echo "configure:6348: checking for C type matching Fortran real*$len" >&5
++    echo "$as_me:$LINENO: checking for C type matching Fortran real*$len" >&5
++echo $ECHO_N "checking for C type matching Fortran real*$len... $ECHO_C" >&6
+     for c_type in float double "long_double" ; do
+ 	eval ctypelen=\$"ac_cv_sizeof_$c_type"
+ 	if test "$testval" = "$ctypelen" -a "$ctypelen" -gt 0 ; then
+-	    echo "$ac_t""$c_type" 1>&6
++	    echo "$as_me:$LINENO: result: $c_type" >&5
++echo "${ECHO_T}$c_type" >&6
+ 	    eval F77_REAL$len=\$"${c_type}_mpi"
+ 	    eval F77_COMPLEX$len2=\$"${c_type}_cplx_mpi"
+             noval="no"
+@@ -6356,7 +13119,8 @@
+         fi
+     done
+     if test "$noval" = "yes" ; then
+-        echo "$ac_t""unavailable" 1>&6
++        echo "$as_me:$LINENO: result: unavailable" >&5
++echo "${ECHO_T}unavailable" >&6
+     fi
+ done
+ 
+@@ -6372,14 +13136,15 @@
+ 
+ 
+ noval="yes"
+-echo $ac_n "checking for C type matching Fortran integer""... $ac_c" 1>&6
+-echo "configure:6377: checking for C type matching Fortran integer" >&5
++echo "$as_me:$LINENO: checking for C type matching Fortran integer" >&5
++echo $ECHO_N "checking for C type matching Fortran integer... $ECHO_C" >&6
+ for c_type in char short int long "long_long" ; do
+     eval ctypelen=\$"ac_cv_sizeof_$c_type"
+     if test "$pac_cv_f77_sizeof_integer" = "$ctypelen" -a \
+        "$ctypelen" -gt 0 ; then
+ 	c_type=`echo $c_type | sed -e 's/_/ /g'`
+-	echo "$ac_t""$c_type" 1>&6
++	echo "$as_me:$LINENO: result: $c_type" >&5
++echo "${ECHO_T}$c_type" >&6
+ 	MPI_FINT_TYPE=$c_type
+ 	noval="no"
+ 	break
+@@ -6388,33 +13153,39 @@
+ if test "$noval" = "yes" ; then
+     # Set a default
+     MPI_FINT_TYPE="int"
+-    echo "$ac_t""unavailable" 1>&6
+-    cat >> confdefs.h <<\EOF
+-#define FINT_TYPE_UNKNOWN 
+-EOF
++    echo "$as_me:$LINENO: result: unavailable" >&5
++echo "${ECHO_T}unavailable" >&6
++
++cat >>confdefs.h <<\_ACEOF
++#define FINT_TYPE_UNKNOWN
++_ACEOF
+ 
+ fi
+ 
+ if test "$MPI_FINT_TYPE" = "int" ; then
+-    cat >> confdefs.h <<\EOF
+-#define FINT_IS_INT 1
+-EOF
++
++cat >>confdefs.h <<\_ACEOF
++#define FINT_IS_INT
++_ACEOF
+ 
+ fi
+ 
+ 
+-echo $ac_n "checking whether C compiler allows unaligned doubles""... $ac_c" 1>&6
+-echo "configure:6408: checking whether C compiler allows unaligned doubles" >&5
+-if eval "test \"`echo '$''{'pac_cv_prog_c_unaligned_doubles'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking whether C compiler allows unaligned doubles" >&5
++echo $ECHO_N "checking whether C compiler allows unaligned doubles... $ECHO_C" >&6
++if test "${pac_cv_prog_c_unaligned_doubles+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+ if test "$cross_compiling" = yes; then
+   pac_cv_prog_c_unaligned_doubles="unknown"
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 6417 "configure"
+-#include "confdefs.h"
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ void fetch_double( v )
+ double *v;
+@@ -6436,69 +13207,110 @@
+ return 0;
+ }
+ 
+-EOF
+-if { (eval echo configure:6441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   pac_cv_prog_c_unaligned_doubles="yes"
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -fr conftest*
+-  pac_cv_prog_c_unaligned_doubles="no"
+-fi
+-rm -fr conftest*
+-fi
+-
+-fi
+-
+-echo "$ac_t""$pac_cv_prog_c_unaligned_doubles" 1>&6
+-
+-if test "X$pac_cv_prog_c_unaligned_doubles" = "no" ; then 
+-echo "configure: warning: Your C compiler $CC does not support unaligned accesses
+-to doubles.  This is required for interoperation with 
+-Fortran (the Fortran standard requires it)." 1>&2
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++pac_cv_prog_c_unaligned_doubles="no"
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++echo "$as_me:$LINENO: result: $pac_cv_prog_c_unaligned_doubles" >&5
++echo "${ECHO_T}$pac_cv_prog_c_unaligned_doubles" >&6
++
++if test "X$pac_cv_prog_c_unaligned_doubles" = "no" ; then
++{ echo "$as_me:$LINENO: WARNING: Your C compiler $CC does not support unaligned accesses
++to doubles.  This is required for interoperation with
++Fortran (the Fortran standard requires it)." >&5
++echo "$as_me: WARNING: Your C compiler $CC does not support unaligned accesses
++to doubles.  This is required for interoperation with
++Fortran (the Fortran standard requires it)." >&2;}
+ fi
+ 
+ 
+ 
+ if test "$enable_weak" = "yes" ; then
+-    
++
+ pragma_extra_message=""
+-echo $ac_n "checking for type of weak symbol support""... $ac_c" 1>&6
+-echo "configure:6469: checking for type of weak symbol support" >&5
+-if eval "test \"`echo '$''{'pac_cv_prog_c_weak_symbols'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for type of weak symbol support" >&5
++echo $ECHO_N "checking for type of weak symbol support... $ECHO_C" >&6
++if test "${pac_cv_prog_c_weak_symbols+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+ # Test for weak symbol support...
+ # We can't put # in the message because it causes autoconf to generate
+ # incorrect code
+-cat > conftest.$ac_ext <<EOF
+-#line 6478 "configure"
+-#include "confdefs.h"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ extern int PFoo(int);
+ #pragma weak PFoo = Foo
+ int Foo(int a) { return a; }
+ 
+-int main() {
++int
++main ()
++{
+ return PFoo(1);
+-; return 0; }
+-EOF
+-if { (eval echo configure:6489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   has_pragma_weak=yes
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+ #
+ # Some systems (Linux ia64 and ecc, for example), support weak symbols
+ # only within a single object file!  This tests that case.
+ # Note that there is an extern int PFoo declaration before the
+ # pragma.  Some compilers require this in order to make the weak symbol
+-# extenally visible.  
++# extenally visible.
+ if test "$has_pragma_weak" = yes ; then
+     rm -f conftest*
+     cat >>conftest1.c <<EOF
+@@ -6514,7 +13326,34 @@
+ EOF
+     ac_link2='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest1.c conftest2.c $LIBS >conftest.out 2>&1'
+     if eval $ac_link2 ; then
+-        pac_cv_prog_c_weak_symbols="pragma weak"
++        # The gcc 3.4.x compiler accepts the pragma weak, but does not
++        # correctly implement it on systems where the loader doesn't
++        # support weak symbols (e.g., cygwin).  This is a bug in gcc, but it
++        # it is one that *we* have to detect.
++        rm -f conftest*
++        cat >>conftest1.c <<EOF
++extern int PFoo(int);
++#pragma weak PFoo = Foo
++int Foo(int);
++int Foo(int a) { return a; }
++EOF
++    cat >>conftest2.c <<EOF
++extern int Foo(int);
++int PFoo(int a) { return a+1;}
++int main(int argc, char **argv) {
++return Foo(0);}
++EOF
++        if eval $ac_link2 ; then
++            pac_cv_prog_c_weak_symbols="pragma weak"
++        else
++            echo "$ac_link2" >> config.log
++	    echo "Failed program was" >> config.log
++            cat conftest1.c >>config.log
++            cat conftest2.c >>config.log
++            if test -s conftest.out ; then cat conftest.out >> config.log ; fi
++            has_pragma_weak=0
++            pragma_extra_message="pragma weak accepted but does not work (probably creates two non-weak entries)"
++        fi
+     else
+       echo "$ac_link2" >>config.log
+       echo "Failed program was" >>config.log
+@@ -6526,49 +13365,105 @@
+     fi
+     rm -f conftest*
+ fi
+-if test -z "$pac_cv_prog_c_weak_symbols" ; then 
+-    cat > conftest.$ac_ext <<EOF
+-#line 6532 "configure"
+-#include "confdefs.h"
++if test -z "$pac_cv_prog_c_weak_symbols" ; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ extern int PFoo(int);
+ #pragma _HP_SECONDARY_DEF Foo  PFoo
+ int Foo(int a) { return a; }
+ 
+-int main() {
++int
++main ()
++{
+ return PFoo(1);
+-; return 0; }
+-EOF
+-if { (eval echo configure:6543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   pac_cv_prog_c_weak_symbols="pragma _HP_SECONDARY_DEF"
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+ fi
+ if test -z "$pac_cv_prog_c_weak_symbols" ; then
+-    cat > conftest.$ac_ext <<EOF
+-#line 6554 "configure"
+-#include "confdefs.h"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ extern int PFoo(int);
+ #pragma _CRI duplicate PFoo as Foo
+ int Foo(int a) { return a; }
+ 
+-int main() {
++int
++main ()
++{
+ return PFoo(1);
+-; return 0; }
+-EOF
+-if { (eval echo configure:6565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   pac_cv_prog_c_weak_symbols="pragma _CRI duplicate x as y"
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+ fi
+ if test -z "$pac_cv_prog_c_weak_symbols" ; then
+     pac_cv_prog_c_weak_symbols="no"
+@@ -6578,73 +13473,103 @@
+ fi
+ 
+ fi
+-
+-echo "$ac_t""$pac_cv_prog_c_weak_symbols" 1>&6
++echo "$as_me:$LINENO: result: $pac_cv_prog_c_weak_symbols" >&5
++echo "${ECHO_T}$pac_cv_prog_c_weak_symbols" >&6
+ if test "$pac_cv_prog_c_weak_symbols" = "no" ; then
+     :
+ else
+     case "$pac_cv_prog_c_weak_symbols" in
+-	"pragma weak") cat >> confdefs.h <<\EOF
++	"pragma weak")
++cat >>confdefs.h <<\_ACEOF
+ #define HAVE_PRAGMA_WEAK 1
+-EOF
+- 
++_ACEOF
++
+ 	;;
+-	"pragma _HP")  cat >> confdefs.h <<\EOF
++	"pragma _HP")
++cat >>confdefs.h <<\_ACEOF
+ #define HAVE_PRAGMA_HP_SEC_DEF 1
+-EOF
++_ACEOF
+ 
+ 	;;
+-	"pragma _CRI") cat >> confdefs.h <<\EOF
++	"pragma _CRI")
++cat >>confdefs.h <<\_ACEOF
+ #define HAVE_PRAGMA_CRI_DUP 1
+-EOF
++_ACEOF
+ 
+ 	;;
+     esac
+-    cat >> confdefs.h <<\EOF
+-#define HAVE_WEAK_SYMBOLS 1
+-EOF
+ 
+-fi
+-echo $ac_n "checking whether __attribute__ ((weak)) allowed""... $ac_c" 1>&6
+-echo "configure:6610: checking whether __attribute__ ((weak)) allowed" >&5
+-if eval "test \"`echo '$''{'pac_cv_attr_weak'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  
+-cat > conftest.$ac_ext <<EOF
+-#line 6616 "configure"
+-#include "confdefs.h"
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_WEAK_SYMBOLS
++_ACEOF
++
++fi
++echo "$as_me:$LINENO: checking whether __attribute__ ((weak)) allowed" >&5
++echo $ECHO_N "checking whether __attribute__ ((weak)) allowed... $ECHO_C" >&6
++if test "${pac_cv_attr_weak+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ int foo(int) __attribute__ ((weak));
+-int main() {
++int
++main ()
++{
+ int a;
+-; return 0; }
+-EOF
+-if { (eval echo configure:6623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   pac_cv_attr_weak=yes
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  pac_cv_attr_weak=no
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++pac_cv_attr_weak=no
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+-echo "$ac_t""$pac_cv_attr_weak" 1>&6
++echo "$as_me:$LINENO: result: $pac_cv_attr_weak" >&5
++echo "${ECHO_T}$pac_cv_attr_weak" >&6
+ 
+ fi
+ 
+ #
+ # Try to get values for Fortran logical variables.
+ if test "$cross_compiling" = "no" ; then
+-    echo $ac_n "checking for values of Fortran logicals""... $ac_c" 1>&6
+-echo "configure:6643: checking for values of Fortran logicals" >&5
+-    if eval "test \"`echo '$''{'pac_cv_prog_f77_true_false_value'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++    echo "$as_me:$LINENO: checking for values of Fortran logicals" >&5
++echo $ECHO_N "checking for values of Fortran logicals... $ECHO_C" >&6
++    if test "${pac_cv_prog_f77_true_false_value+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
+-    
++
++
+ rm -f conftest*
+ cat <<EOF > conftest.f
+ 
+@@ -6659,24 +13584,31 @@
+ if test "X$ac_fcompile" = "X" ; then
+     ac_fcompile='${F77-f77} -c $FFLAGS conftest.f 1>&5'
+ fi
+-if { (eval echo configure:6663: \"$ac_fcompile\") 1>&5; (eval $ac_fcompile) 2>&5; } && test -s conftest.o ; then
++if { (eval echo "$as_me:$LINENO: \"$ac_fcompile\"") >&5
++  (eval $ac_fcompile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest.o ; then
+     mv conftest.o conftestf.o
+-    
++
++
+     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+     save_LIBS="$LIBS"
+     LIBS="conftestf.o $FLIBS $LIBS"
+     if test "$cross_compiling" = yes; then
+-  : 
++  :
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 6679 "configure"
+-#include "confdefs.h"
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdio.h>
+ #ifdef F77_NAME_UPPER
+ #define ftest_ FTEST
+@@ -6696,28 +13628,37 @@
+ }
+ 
+ 
+-EOF
+-if { (eval echo configure:6701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-then
+-  
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
+     pac_cv_prog_f77_true_false_value=`cat conftestval`
+ 
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -fr conftest*
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+     LIBS="$save_LIBS"
+     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-else 
++else
+     echo "configure: failed program was:" >&5
+     cat conftest.f >&5
+ fi
+@@ -6728,21 +13669,24 @@
+     true_val="`echo $pac_cv_prog_f77_true_false_value | sed -e 's/ .*//g'`"
+     false_val="`echo $pac_cv_prog_f77_true_false_value | sed -e 's/.*  *//g'`"
+     if test -n "$true_val" -a -n "$false_val" ; then
+-        cat >> confdefs.h <<\EOF
+-#define F77_TRUE_VALUE_SET 1
+-EOF
+ 
+-        cat >> confdefs.h <<EOF
++cat >>confdefs.h <<\_ACEOF
++#define F77_TRUE_VALUE_SET
++_ACEOF
++
++        cat >>confdefs.h <<_ACEOF
+ #define F77_TRUE_VALUE $true_val
+-EOF
++_ACEOF
+ 
+-        cat >> confdefs.h <<EOF
++        cat >>confdefs.h <<_ACEOF
+ #define F77_FALSE_VALUE $false_val
+-EOF
++_ACEOF
+ 
+-	echo "$ac_t""True is $true_val and False is $false_val" 1>&6
++	echo "$as_me:$LINENO: result: True is $true_val and False is $false_val" >&5
++echo "${ECHO_T}True is $true_val and False is $false_val" >&6
+     else
+-	echo "$ac_t""could not determine" 1>&6
++	echo "$as_me:$LINENO: result: could not determine" >&5
++echo "${ECHO_T}could not determine" >&6
+     fi
+ fi
+ 
+@@ -6764,45 +13708,65 @@
+ 
+ if test "$pac_lib_mpi_is_building" = "yes" ; then
+     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+     FARGOBJ="farg.o"
+-    cat >> confdefs.h <<\EOF
++
++cat >>confdefs.h <<\_ACEOF
+ #define HAS_MPIR_ERR_SETMSG 1
+-EOF
++_ACEOF
+ 
+ else
+     # Test for mpir_iargc; if not found, add farg.f.in
+-    echo $ac_n "checking for mpir_iargc provided for command line in Fortran""... $ac_c" 1>&6
+-echo "configure:6782: checking for mpir_iargc provided for command line in Fortran" >&5
++    echo "$as_me:$LINENO: checking for mpir_iargc provided for command line in Fortran" >&5
++echo $ECHO_N "checking for mpir_iargc provided for command line in Fortran... $ECHO_C" >&6
+     ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
+-
+-    cat > conftest.$ac_ext <<EOF
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
++    cat >conftest.$ac_ext <<_ACEOF
+       program main
+-      mpir_iargc()
++mpir_iargc()
+       end
+-EOF
+-if { (eval echo configure:6794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+   found="yes"
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  found="no"
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++found="no"
+ fi
+-rm -f conftest*
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+     if test "$found" = "no" ; then
+-        echo "$ac_t""no" 1>&6
+-        
++        echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++
+ if test "X$pac_save_level" = "X" ; then
+     pac_save_CC="$CC"
+     pac_save_CXX="$CXX"
+@@ -6813,127 +13777,238 @@
+     pac_save_prog_cxx_cross="$ac_cv_prog_cxx_cross"
+     pac_save_prog_f90_cross="$pac_cv_prog_f90_cross"
+     if test "X$CPP" = "X" ; then
+-	echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:6818: checking how to run the C preprocessor" >&5
++	ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++  if test "${ac_cv_prog_CPP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-    # This must be in double quotes, not single quotes, because CPP may get
+-  # substituted into the Makefile and "${CC-cc}" will confuse make.
+-  CPP="${CC-cc} -E"
++      # Double quotes because CPP needs to be expanded
++    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp.
+-  cat > conftest.$ac_ext <<EOF
+-#line 6833 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:6839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+-if test -z "$ac_err"; then
+-  :
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP="${CC-cc} -E -traditional-cpp"
+-  cat > conftest.$ac_ext <<EOF
+-#line 6850 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:6856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+-if test -z "$ac_err"; then
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
+   :
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP="${CC-cc} -nologo -E"
+-  echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
+-echo "configure:6867: checking how to run the C++ preprocessor" >&5
+-if test -z "$CXXCPP"; then
+-if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_ext=C
+-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cxx_cross
+-  CXXCPP="${CXX-g++} -E"
+-  cat > conftest.$ac_ext <<EOF
+-#line 6880 "configure"
+-#include "confdefs.h"
+-#include <stdlib.h>
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:6885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+-if test -z "$ac_err"; then
+-  :
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CXXCPP=/lib/cpp
++  ac_cpp_err=yes
+ fi
+-rm -f conftest*
+-  ac_cv_prog_CXXCPP="$CXXCPP"
+-ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
+ fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  break
+ fi
+-CXXCPP="$ac_cv_prog_CXXCPP"
+-echo "$ac_t""$CXXCPP" 1>&6
+-s%@CXXCPP@%$CXXCPP%g
+ 
+-cat > conftest.$ac_ext <<EOF
+-#line 6909 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:6915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$" | grep -v "^conftest.${ac_ext}:\$"`
+-if test -z "$ac_err"; then
+-  :
++    done
++    ac_cv_prog_CPP=$CPP
++
++fi
++  CPP=$ac_cv_prog_CPP
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP=/lib/cpp
++  ac_cv_prog_CPP=$CPP
+ fi
+-rm -f conftest*
++echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6
++ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
+ fi
+-rm -f conftest*
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
+ fi
+-rm -f conftest*
+-  ac_cv_prog_CPP="$CPP"
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
+ fi
+-  CPP="$ac_cv_prog_CPP"
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  :
+ else
+-  ac_cv_prog_CPP="$CPP"
++  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
+ fi
+-echo "$ac_t""$CPP" 1>&6
++
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+     fi
+     pac_save_CPP="$CPP"
+@@ -6942,12 +14017,12 @@
+     F77="${TESTF77:=$F77}"
+     F90="${TESTF90:=$F90}"
+     if test -z "$TESTCPP" ; then
+-        
++
+ if test -z "$TESTCPP"; then
+-  if eval "test \"`echo '$''{'pac_cv_prog_TESTCPP'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++  if test "${pac_cv_prog_TESTCPP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  
++
+   rm -f conftest.*
+   cat > conftest.c <<EOF
+   #include <assert.h>
+@@ -6957,62 +14032,78 @@
+   # not just through cpp.
+   TESTCPP="${TESTCC-cc} -E"
+   ac_try="$TESTCPP conftest.c >/dev/null 2>conftest.out"
+-  if { (eval echo configure:6961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ; then
++  if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } ; then
+       pac_cv_prog_TESTCPP="$TESTCPP"
+   fi
+   if test "X$pac_cv_prog_TESTCPP" = "X" ; then
+       TESTCPP="${TESTCC-cc} -E -traditional-cpp"
+       ac_try="$TESTCPP conftest.c >/dev/null 2>conftest.out"
+-      if { (eval echo configure:6967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ; then
++      if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } ; then
+           pac_cv_prog_TESTCPP="$TESTCPP"
+       fi
+   fi
+   if test "X$pac_cv_prog_TESTCPP" = "X" ; then
+       TESTCPP="${TESTCC-cc} -nologo -E"
+       ac_try="$TESTCPP conftest.c >/dev/null 2>conftest.out"
+-      if { (eval echo configure:6974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ; then
++      if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } ; then
+           pac_cv_prog_TESTCPP="$TESTCPP"
+       fi
+   fi
+   if test "X$pac_cv_prog_TESTCPP" = "X" ; then
+       # Extract the first word of "cpp", so it can be a program name with args.
+ set dummy cpp; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:6982: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_TESTCPP'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_TESTCPP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case "$TESTCPP" in
+-  /*)
++  case $TESTCPP in
++  [\\/]* | ?:[\\/]*)
+   ac_cv_path_TESTCPP="$TESTCPP" # Let the user override the test with a path.
+   ;;
+-  ?:/*)			 
+-  ac_cv_path_TESTCPP="$TESTCPP" # Let the user override the test with a dos path.
+-  ;;
+   *)
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do 
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_TESTCPP="$ac_dir/$ac_word"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_TESTCPP="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
+   ;;
+ esac
+ fi
+-TESTCPP="$ac_cv_path_TESTCPP"
++TESTCPP=$ac_cv_path_TESTCPP
++
+ if test -n "$TESTCPP"; then
+-  echo "$ac_t""$TESTCPP" 1>&6
++  echo "$as_me:$LINENO: result: $TESTCPP" >&5
++echo "${ECHO_T}$TESTCPP" >&6
+ else
+-  echo "$ac_t""no" 1>&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+   fi
+   rm -f conftest.*
+-  
++
+ fi
+ 
+ else
+@@ -7024,26 +14115,30 @@
+     pac_save_level="0"
+     # Recompute cross_compiling values and set for the current language
+     # This is just:
+-    
++
++
+     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+     if test "$pac_cross_compiling" = "yes" ; then
+         ac_cv_prog_cc_cross=yes
+ 	ac_cv_prog_cc_works=yes
+     else
+-        cat > conftest.$ac_ext << EOF
++        cat > conftest.$ac_ext <<EOF
+ 
+-#line 7042 "configure"
++#line 14132 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:7047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -7059,29 +14154,34 @@
+ rm -fr conftest*
+     fi
+     ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+     # Ignore Fortran if we aren't using it.
+     if test -n "$F77" ; then
+-        
++
++
+         ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+ 	if test "$pac_cross_compiling" = "yes" ; then
+ 	    ac_cv_prog_f77_cross=yes
+ 	    ac_cv_prog_f77_works=yes
+ 	else
+-            cat > conftest.$ac_ext << EOF
++            cat > conftest.$ac_ext <<EOF
+ 
+       program conftest
+       end
+ 
+ EOF
+-if { (eval echo configure:7085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_f77_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -7097,29 +14197,33 @@
+ rm -fr conftest*
+ 	fi
+         ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+     fi
+     # Ignore C++ if we aren't using it.
+     if test -n "$CXX" ; then
+-        
+-        ac_ext=C
+-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++
++
++        ac_ext=cc
+ ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cxx_cross
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+-        cat > conftest.$ac_ext << EOF
++        cat > conftest.$ac_ext <<EOF
+ 
+-#line 7118 "configure"
++#line 14217 "configure"
+ #include "confdefs.h"
+ 
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:7123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cxx_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -7134,19 +14238,19 @@
+ fi
+ rm -fr conftest*
+         ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+     fi
+     # Ignore Fortran 90 if we aren't using it.
+     if test -n "$F90" ; then
+-        
+-        
+-ac_ext=$pac_cv_f90_ext
+-ac_compile='${F90-f90} -c $F90FLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F90-f90} -o conftest${ac_exeext} $F90FLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$pac_cv_prog_f90_cross
++
++
++        ac_ext=${ac_f90ext-f}
++ac_compile='$F90 -c $F90FLAGS conftest.$ac_ext >&5'
++ac_link='$F90 -o conftest$ac_exeext $F90FLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f90_compiler_gnu
+ 
+ 	        	if test "$pac_cross_compiling" = "yes" ; then
+ 	    ac_cv_prog_f90_cross=yes
+@@ -7174,34 +14278,35 @@
+ 	pac_cv_prog_f90_works="$ac_cv_prog_f90_works"
+         rm -fr conftest*
+         ac_ext=f
+-ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_f77_cross
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+     fi
+ fi
+ pac_save_level=`expr $pac_save_level + 1`
+ 
+-        
++
+ found_cached="yes"
+-echo $ac_n "checking for routines to access the command line from Fortran 77""... $ac_c" 1>&6
+-echo "configure:7189: checking f