[SCM] GNU Autoconf source repository branch, master, updated. v2.68-43-gce791e5

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=ce791e5a957f3bb7787a804423482f9c708a698e

The branch, master has been updated
       via  ce791e5a957f3bb7787a804423482f9c708a698e (commit)
      from  f9fb23548804e962be8ce619e7fcec62299c100e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ce791e5a957f3bb7787a804423482f9c708a698e
Author: Christian Rössel <address@hidden>
Date:   Sun Feb 20 18:24:23 2011 +0100

    Fix OpenMP flag detection for various Fortran compilers.
    
    * lib/autoconf/c.m4 (_AC_LANG_OPENMP(Fortran 77)): Use '!$'
    OpenMP-conditional compilation construct, to force compile
    failure with missing OpenMP flag.
    (AC_OPENMP): Add flags for Cray CCE and NEC SX compilers.
    * THANKS: Update.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   10 ++++++++++
 THANKS            |    1 +
 lib/autoconf/c.m4 |   13 +++++++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0bd0b78..52d4cac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-20  Christian Rössel  <address@hidden>  (tiny change)
+           Markus Geimer  <address@hidden>  (tiny change)
+
+       Fix OpenMP flag detection for various Fortran compilers.
+       * lib/autoconf/c.m4 (_AC_LANG_OPENMP(Fortran 77)): Use '!$'
+       OpenMP-conditional compilation construct, to force compile
+       failure with missing OpenMP flag.
+       (AC_OPENMP): Add flags for Cray CCE and NEC SX compilers.
+       * THANKS: Update.
+
 2011-02-18  Eric Blake  <address@hidden>
 
        docs: document fourth argument of AC_RUN_IFELSE better
diff --git a/THANKS b/THANKS
index a3ee752..d397327 100644
--- a/THANKS
+++ b/THANKS
@@ -257,6 +257,7 @@ Mark Hessling               address@hidden
 Mark Kettenis               address@hidden
 Markku Savela               address@hidden
 Markus Oberhumer            address@hidden
+Markus Geimer               address@hidden
 Martin Buchholz             address@hidden
 Martin Costabel             address@hidden
 Martin Frydl                address@hidden
diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 871e1c9..89e6b49 100644
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -1957,7 +1957,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)
 # ------------------------
@@ -1992,12 +1999,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],


hooks/post-receive
-- 
GNU Autoconf source repository