Merge branch 'u/loh/master' of gitta:amarek/ELPA

configure.ac

@@ -252,6 +252,9 @@ AC_ARG_WITH([openmp],
 	AC_DEFINE([WITH_OPENMP], [1], [use OpenMP threading])
 
         AX_ELPA_OPENMP
+        if test "$ac_cv_prog_fc_openmp" = unsupported; then
+          AC_MSG_ERROR([Could not compile a program with OpenMP, adjust FCFLAGS])
+        fi
 
         # Append to flags as this influences which
         # kind of MPI library has to be used (thread-safe or not)

m4/ax_elpa_openmp.m4

@@ -31,7 +31,14 @@ m4_copy([_AX_ELPA_LANG_OPENMP(C)], [_AX_ELPA_LANG_OPENMP(C++)])
 # _AX_ELPA_LANG_OPENMP(Fortran 77)
 # ---------------------------
 m4_define([_AX_ELPA_LANG_OPENMP(Fortran 77)],
-[AC_LANG_FUNC_LINK_TRY([omp_get_num_threads])])
+[
+program test_openmp
+ use omp_lib
+ implicit none
+ !$ integer :: foobar
+ foobar = omp_get_num_threads()
+end program
+])
 
 # _AX_ELPA_LANG_OPENMP(Fortran)
 # ---------------------------