Fix OpenMP flag detection for various Fortran compilers.

[pspp] / m4 / openmp.m4

diff --git a/m4/openmp.m4 b/m4/openmp.m4
index 254511570edf38c8b4631d5dea36ae0818e39c36..cedfb4cd500d7dbcef3adcf6312b15f135feb8aa 100644 (file)
--- a/m4/openmp.m4
+++ b/m4/openmp.m4
@@ -1,5 +1,5 @@
-# openmp.m4 serial 7
-dnl Copyright (C) 2006-2009 Free Software Foundation, Inc.
+# openmp.m4 serial 8
+dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -35,7 +35,14 @@ m4_copy([_AC_LANG_OPENMP(C)], [_AC_LANG_OPENMP(C++)])
 # _AC_LANG_OPENMP(Fortran 77)
 # ---------------------------
 m4_define([_AC_LANG_OPENMP(Fortran 77)],
-[AC_LANG_FUNC_LINK_TRY([omp_get_num_threads])])
+[
+      program main
+      implicit none
+!$    integer tid
+      tid = 42
+      call omp_set_num_threads(2)
+      end
+])
 
 # _AC_LANG_OPENMP(Fortran)
 # ---------------------------
@@ -70,12 +77,14 @@ AC_DEFUN([AC_OPENMP],
           dnl   SGI C, PGI C         -mp
           dnl   Tru64 Compaq C       -omp
           dnl   IBM C (AIX, Linux)   -qsmp=omp
+          dnl   Cray CCE             -homp
+          dnl   NEC SX               -Popenmp
           dnl If in this loop a compiler is passed an option that it doesn't
           dnl understand or that it misinterprets, the AC_LINK_IFELSE test
           dnl will fail (since we know that it failed without the option),
           dnl therefore the loop will continue searching for an option, and
           dnl no output file called 'penmp' or 'mp' is created.
-          for ac_option in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp; do
+          for ac_option in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp -homp -Popenmp; do
             ac_save_[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
             _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $ac_option"
             AC_LINK_IFELSE([_AC_LANG_OPENMP],