--- a/config/accompiler.m4
+++ b/config/accompiler.m4
@@ -154,7 +154,7 @@
 lac_CFLAGS="$CFLAGS "
 lac_CPPFLAGS="$CPPFLAGS -I$includedir -I$flavorincludedir"
 lac_CXXFLAGS="$CXXFLAGS "
-lac_LDFLAGS="$LDFLAGS -L$libdir "
+lac_LDFLAGS="$LDFLAGS "
 lac_LIBS="$LIBS "
 lac_F77FLAGS="$F77FLAGS "
 lac_F90FLAGS="$F90FLAGS "
@@ -370,6 +370,48 @@
         fi
         CC="$lac_cv_CC"
         ;;
+    *mips-*linux* | *mipsel-*linux* | *mips64-*linux* | *mips64el-*linux* )
+        if test "$GLOBUS_CC" = "mpicc"; then
+            AC_PATH_PROGS(lac_cv_CC,  $CC  mpicc)
+            AC_PATH_PROGS(lac_cv_CXX, $CXX mpicxx mpic++ mpiCC)
+            AC_PATH_PROGS(lac_cv_F77, $F77 mpif77)
+            AC_PATH_PROGS(lac_cv_F90, $F90 mpif90)
+        else
+            if test "$GLOBUS_CC" = "gcc"; then
+                if test "$lac_cv_build_64bit" = "yes"; then
+                    lac_CFLAGS="$lac_CFLAGS -mabi=64"
+                    lac_CXXFLAGS="$lac_CXXFLAGS -mabi=64"
+                    lac_LDFLAGS="$lac_LDFLAGS -mabi=64"
+                else
+                    if (echo '#ifdef __ILP32__'; \
+                        echo 'isx32'; \
+                        echo '#endif') | gcc -E -x c - | grep -q isx32 ; then
+                        lac_CFLAGS="$lac_CFLAGS -mabi=n32"
+                        lac_CXXFLAGS="$lac_CXXFLAGS -mabi=n32"
+                        lac_LDFLAGS="$lac_LDFLAGS -mabi=n32"
+                    else
+                        lac_CFLAGS="$lac_CFLAGS -mabi=32"
+                        lac_CXXFLAGS="$lac_CXXFLAGS -mabi=32"
+                        lac_LDFLAGS="$lac_LDFLAGS -mabi=32"
+                    fi
+                fi
+                AC_PATH_PROGS(lac_cv_CC, $CC gcc)
+                AC_PATH_PROGS(lac_cv_CXX, $CXX c++ g++)
+                AC_PATH_PROGS(lac_cv_F77, $F77 f77 g77)
+                AC_PATH_PROGS(lac_cv_F90, $F90 f90)
+            else
+                AC_PATH_PROGS(lac_cv_CC, $CC icc ecc cc)
+                AC_PATH_PROGS(lac_cv_CXX, $CXX $CCC icpc ecpc CC c++)
+                AC_PATH_PROGS(lac_cv_F77, $F77 ifort efc f77)
+                AC_PATH_PROGS(lac_cv_F90, $F90 ifort efc f90)
+                # should really check that we really are dealing
+                # with intel compiler
+                lac_CFLAGS="$lac_CFLAGS -no-gcc -restrict"
+            fi
+        fi
+        CC="$lac_cv_CC"
+        ;;
+
     *powerpc64-*linux*|*powerpc64le-*linux* )
         if test "$GLOBUS_CC" = "mpicc"; then
             AC_PATH_PROGS(lac_cv_CC,  $CC  mpicc)