diff --git a/configure.ac b/configure.ac
index 214184d..1df849a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,15 @@ AC_CHECK_LIB([z],[gzclose],[STATIC=1],[STATIC=0],[-static])
 STATIC_LIB="../EZFIO/lib/libezfio_irp.a"
 SHARED_LIB="-L../EZFIO/lib -lezfio"
 
+# Test IRPF90
+# ------------
+
+AC_CHECK_PROG([IRPF90],[irpf90],[yes],[no])
+if [[ $IRPF90 = no ]] ; then
+  AC_MSG_ERROR([Please install IRPF90:\nhttp://irpf90.sourceforge.net])
+fi
+IRPF90=`which irpf90`
+
 # Test Fortran
 # ------------
 
@@ -64,6 +73,7 @@ AC_FC_FREEFORM
 case $FC in
     mpif90*)
        FCFLAGS="-O3"
+       IRPF90="$IRPF90 -DMPI"
        ;;
     ifort*)
        FCFLAGS="-O3 -axT -ip"
@@ -79,14 +89,6 @@ case $FC in
        ;;
 esac
 
-# Test IRPF90
-# ------------
-
-AC_CHECK_PROG([IRPF90],[irpf90],[yes],[no])
-if [[ $IRPF90 = no ]] ; then
-  AC_MSG_ERROR([Please install IRPF90:\nhttp://irpf90.sourceforge.net])
-fi
-IRPF90=`which irpf90`
 AC_SUBST(IRPF90)
 
 # Write make.config