update mpich linux

linx64/mpi/mpich/bin/mpicc

@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/bash
 # 
 # (C) 2006 by Argonne National Laboratory.
 #     See COPYRIGHT in top-level directory.
@@ -27,17 +27,17 @@
 #
 # Directory locations: Fixed for any MPI implementation.
 # Set from the directory arguments to configure (e.g., --prefix=/usr/local)
-prefix=/home/brgirgis/Documents/code/thirdparty/mpi/mpich_/build/../release_install
-exec_prefix=/home/brgirgis/Documents/code/thirdparty/mpi/mpich_/build/../release_install
-sysconfdir=/home/brgirgis/Documents/code/thirdparty/mpi/mpich_/build/../release_install/etc
-includedir=/home/brgirgis/Documents/code/thirdparty/mpi/mpich_/build/../release_install/include
-libdir=/home/brgirgis/Documents/code/thirdparty/mpi/mpich_/build/../release_install/lib64
+prefix=/home/brgirgis/Documents/code/idiscovery/cpp-thirdparty-src/mpi/mpich/install/3.3.1
+exec_prefix=/home/brgirgis/Documents/code/idiscovery/cpp-thirdparty-src/mpi/mpich/install/3.3.1
+sysconfdir=/home/brgirgis/Documents/code/idiscovery/cpp-thirdparty-src/mpi/mpich/install/3.3.1/etc
+includedir=/home/brgirgis/Documents/code/idiscovery/cpp-thirdparty-src/mpi/mpich/install/3.3.1/include
+libdir=/home/brgirgis/Documents/code/idiscovery/cpp-thirdparty-src/mpi/mpich/install/3.3.1/lib64
 
 # Default settings for compiler, flags, and libraries.
 # Determined by a combination of environment variables and tests within
 # configure (e.g., determining whehter -lsocket is needee)
 CC="gcc"
-MPICH_VERSION="3.2.1"
+MPICH_VERSION="3.3.1"
 
 enable_wrapper_rpath="yes"
 
@@ -117,6 +117,7 @@ linking=yes
 allargs=("$@")
 argno=0
 interlib_deps=yes
+static_mpi=no
 for arg in "$@" ; do
     # Set addarg to no if this arg should be ignored by the C compiler
     addarg=yes
@@ -133,6 +134,11 @@ for arg in "$@" ; do
     -static)
     interlib_deps=no
     ;;
+    -static-mpi)
+    interlib_deps=no
+    static_mpi=yes
+    addarg=no
+    ;;
     -echo)
     addarg=no
     set -x
@@ -244,7 +250,7 @@ final_ldflags=" "
 final_libs=""
 if test "yes" = "no" -o "${interlib_deps}" = "no" ; then
     final_ldflags="${final_ldflags} "
-    final_libs="${final_libs} -lpthread    -lrt -lpthread "
+    final_libs="${final_libs}  -lm   -lpthread  -lrt "
 fi
 
 # -----------------------------------------------------------------------
@@ -275,7 +281,20 @@ if [ "$linking" = yes ] ; then
         $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} ${final_ldflags} "${allargs[@]}" -I$includedir
         rc=$?
     else
-        $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} ${final_ldflags} "${allargs[@]}" -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -lmpi  $PROFILE_POSTLIB ${final_libs}
+        if [ "$static_mpi" = no ] ; then
+          $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} ${final_ldflags} "${allargs[@]}" -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -lmpi  $PROFILE_POSTLIB ${final_libs}
+        else
+          fabric_dep=""
+          if [ "" = yes ] ; then
+              fabric_dep=`pkg-config --static --libs $libdir/pkgconfig/libfabric.pc`
+              fabric_dep=`echo $fabric_dep | sed 's/-lfabric//'`
+          elif [ -f /lib/pkgconfig/libfabric.pc ] ; then
+              fabric_dep=`pkg-config --static --libs /lib/pkgconfig/libfabric.pc`
+          else
+              fabric_dep=`pkg-config --static --libs libfabric`
+          fi
+          $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} ${final_ldflags} "${allargs[@]}" -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO $rpath_flags $libdir/libmpi.a  $PROFILE_POSTLIB ${final_libs} ${fabric_dep}
+        fi
         rc=$?
     fi
 else