Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / smpi / smpif90.in

diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in
index cccf214..04a16d6 100644 (file)
--- a/src/smpi/smpif90.in
+++ b/src/smpi/smpif90.in
@@ -30,7 +30,7 @@ trap 'cleanup' EXIT
 filter_and_compile() {
     list_add TMPFILES "${TMPFILE}"
 #replace "program main_name by subroutine user\_main (and the end clause as well)"
-    sed 's/[[:space:]]*program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/ subroutine user\_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI' "${ARG}" > "${TMPFILE}"
+    sed 's/[[:space:]]*[pP][rR][oO][gG][rR][aA][mM][[:space:]]*\([a-zA-Z0-9\-\_]*\)/ subroutine user\_main /g;s/[[:space:]]*[uU][sS][eE][[:space:]]*[mM][pP][iI]/\include \"mpif\.h\" /g' "${ARG}" > "${TMPFILE}"
     SRCFILE="${TMPFILE}"
     list_add CMDLINE "${SRCFILE}"
 }
@@ -65,6 +65,10 @@ while [ $# -gt 0 ]; do
         '-compiler-version' | '--compiler-version')
             ${F90} --version
             ;;
+        -o)
+            list_add CMDLINE "-o$1"
+            shift
+            ;;
         *)
             list_add CMDLINE "${ARG}"
             ;;