From a20cc0c160a2f688a205d075206fc38f418a94b4 Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@cranfield.ac.uk>
Date: Thu, 22 Jan 2015 18:00:42 +0000
Subject: [PATCH] psblas-3.3-maint: Merged changes from trunk in preparation
 for 3.3.1

---
 configure    | 35 ++---------------------------------
 configure.ac | 18 +++++++++---------
 2 files changed, 11 insertions(+), 42 deletions(-)

diff --git a/configure b/configure
index e3a2dfbb5..f637c9989 100755
--- a/configure
+++ b/configure
@@ -7385,37 +7385,7 @@ fi
 if test x"$pac_cv_serial_mpi" == x"yes" ; then
    FDEFINES="$psblas_cv_define_prepend-DSERIAL_MPI $psblas_cv_define_prepend-DMPI_MOD $FDEFINES";
 else
- ac_exeext=''
-ac_ext='f90'
-ac_link='${MPIFC-$FC} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-{ $as_echo "$as_me:$LINENO: checking MPI Fortran 2008 interface" >&5
-$as_echo_n "checking MPI Fortran 2008 interface... " >&6; }
-cat > conftest.$ac_ext <<EOF
-           program test
-             use mpi_f08
-           end program test
-EOF
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-  pac_cv_mpi_f08="yes";
-  { $as_echo "$as_me:$LINENO: result:  use mpi_f08. " >&5
-$as_echo " use mpi_f08. " >&6; }
-  :
-else
-  pac_cv_mpi_f08="no";
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  { $as_echo "$as_me:$LINENO: result:  no. " >&5
-$as_echo " no. " >&6; }
-fi
-rm -f conftest*
- if test x"$pac_cv_mpi_f08" == x"yes" ; then
-    FDEFINES="$psblas_cv_define_prepend-DMPI_MOD_F08 $FDEFINES";
-  else
-    ac_exeext=''
+  ac_exeext=''
 ac_ext='f90'
 ac_link='${MPIFC-$FC} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 { $as_echo "$as_me:$LINENO: checking MPI Fortran interface" >&5
@@ -7443,8 +7413,7 @@ $as_echo " include mpif.h " >&6; }
   FDEFINES="$psblas_cv_define_prepend-DMPI_H $FDEFINES"
 fi
 rm -f conftest*
- fi
-fi
+  fi
 
 
 { $as_echo "$as_me:$LINENO: checking whether we want long (8 bytes) integers" >&5
diff --git a/configure.ac b/configure.ac
index f7771132d..d609dafeb 100755
--- a/configure.ac
+++ b/configure.ac
@@ -515,15 +515,15 @@ fi
 if test x"$pac_cv_serial_mpi" == x"yes" ; then
    FDEFINES="$psblas_cv_define_prepend-DSERIAL_MPI $psblas_cv_define_prepend-DMPI_MOD $FDEFINES";
 else 
- PAC_FORTRAN_CHECK_HAVE_MPI_MOD_F08()
- if test x"$pac_cv_mpi_f08" == x"yes" ; then
-    FDEFINES="$psblas_cv_define_prepend-DMPI_MOD_F08 $FDEFINES";
-  else					     	     
-    PAC_FORTRAN_CHECK_HAVE_MPI_MOD(
- 	  [FDEFINES="$psblas_cv_define_prepend-DMPI_MOD $FDEFINES"],
-	  [FDEFINES="$psblas_cv_define_prepend-DMPI_H $FDEFINES"])	  
- fi
-fi
+dnl PAC_FORTRAN_CHECK_HAVE_MPI_MOD_F08()
+dnl if test x"$pac_cv_mpi_f08" == x"yes" ; then
+dnl    FDEFINES="$psblas_cv_define_prepend-DMPI_MOD_F08 $FDEFINES";
+dnl  else					     	     
+  PAC_FORTRAN_CHECK_HAVE_MPI_MOD(
+       [FDEFINES="$psblas_cv_define_prepend-DMPI_MOD $FDEFINES"],
+     [FDEFINES="$psblas_cv_define_prepend-DMPI_H $FDEFINES"])	  
+  fi
+dnl fi
 
 PAC_ARG_LONG_INTEGERS
 if test x"$pac_cv_long_integers" == x"yes" ; then