[svn-r26052] Fixed false positive tests for intrensic functions.

Tested: jam (mpi, gfortran, intel)
        --enable-fortran, and --enable-fortran --enable-fortran2003

2 files changed, 14 insertions, 11 deletions

diff --git a/m4/aclocal_cxx.m4 b/m4/aclocal_cxx.m4
index 2068587..f373b51 100644
--- a/m4/aclocal_cxx.m4
+++ b/m4/aclocal_cxx.m4
@@ -25,12 +25,12 @@ dnl Checking if C++ needs old style header files in includes
 
 AC_DEFUN([PAC_PROG_CXX_HEADERS],[
   AC_MSG_CHECKING([if $CXX needs old style header files in includes])
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+  AC_LINK_IFELSE([AC_LANG_SOURCE([
 #include <iostream>
 
 int main(void) { return 0; }
   ])],
-    [AC_MSG_RESULT([no])], 
+    [AC_MSG_RESULT([no])],
     [AC_MSG_RESULT([yes])
     CXXFLAGS="${CXXFLAGS} -DOLD_HEADER_FILENAME"
     AM_CXXFLAGS="${AM_CXXFLAGS} -DOLD_HEADER_FILENAME"])
@@ -40,7 +40,7 @@ dnl Checking if ++ can handle namespaces
 
 AC_DEFUN([PAC_PROG_CXX_NAMESPACE],[
   AC_MSG_CHECKING([if $CXX can handle namespaces])
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+  AC_LINK_IFELSE([AC_LANG_SOURCE([
 namespace H5 {
 int fnord;
 }
@@ -60,7 +60,7 @@ dnl Checking if C++ supports std
 
 AC_DEFUN([PAC_PROG_CXX_STD],[
   AC_MSG_CHECKING([if $CXX supports std])
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+  AC_LINK_IFELSE([AC_LANG_SOURCE([
 #include <string>
 
 using namespace std;
@@ -79,7 +79,7 @@ dnl Checking if C++ has offsetof extension
 
 AC_DEFUN([PAC_PROG_CXX_OFFSETOF],[
   AC_MSG_CHECKING([if $CXX has offsetof extension])
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([
   #include <stdio.h>
   #include <stddef.h>
     ],[
@@ -102,7 +102,7 @@ dnl Checking if C++ can handle static cast
 
 AC_DEFUN([PAC_PROG_CXX_STAIC_CAST],[
   AC_MSG_CHECKING([if $CXX can handle static cast])
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+  AC_LINK_IFELSE([AC_LANG_SOURCE([
 int main(void) {
    float test_float;
    int test_int;
diff --git a/m4/aclocal_fc.m4 b/m4/aclocal_fc.m4
index ec638a3..72b0d64 100644
--- a/m4/aclocal_fc.m4
+++ b/m4/aclocal_fc.m4
@@ -60,8 +60,9 @@ dnl
 dnl See if the fortran compiler supports the intrinsic function "SIZEOF"
 
 AC_DEFUN([PAC_PROG_FC_SIZEOF],[
+  HAVE_SIZEOF_FORTRAN="no"
   AC_MSG_CHECKING([if Fortran compiler supports intrinsic SIZEOF])
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([ 
+  AC_LINK_IFELSE([AC_LANG_SOURCE([ 
    PROGRAM main
      i = sizeof(x)
    END PROGRAM
@@ -73,8 +74,9 @@ AC_DEFUN([PAC_PROG_FC_SIZEOF],[
 dnl See if the fortran compiler supports the intrinsic function "C_SIZEOF"
 
 AC_DEFUN([PAC_PROG_FC_C_SIZEOF],[
+  HAVE_C_SIZEOF_FORTRAN="no"
   AC_MSG_CHECKING([if Fortran compiler supports intrinsic C_SIZEOF])
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([ 
+  AC_LINK_IFELSE([AC_LANG_SOURCE([ 
    PROGRAM main
      USE ISO_C_BINDING
      INTEGER(C_INT) :: a
@@ -89,8 +91,9 @@ AC_DEFUN([PAC_PROG_FC_C_SIZEOF],[
 dnl See if the fortran compiler supports the intrinsic function "STORAGE_SIZE"
 
 AC_DEFUN([PAC_PROG_FC_STORAGE_SIZE],[
+  HAVE_STORAGE_SIZE_FORTRAN="no"
   AC_MSG_CHECKING([if Fortran compiler supports intrinsic STORAGE_SIZE])
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+  AC_LINK_IFELSE([AC_LANG_SOURCE([
    PROGRAM main
      INTEGER :: a
      INTEGER :: result
@@ -106,6 +109,7 @@ dnl Check to see if -r8 was specified to determine if we need to
 dnl compile the DOUBLE PRECISION interfaces.
 
 AC_DEFUN([PAC_PROG_FC_DEFAULT_REALisDBLE],[
+  FORTRAN_DEFAULT_REALisDBLE="no"	
   AC_MSG_CHECKING([if Fortran default REAL is DOUBLE PRECISION])
   
   AC_COMPILE_IFELSE([AC_LANG_SOURCE([
@@ -140,8 +144,7 @@ dnl disable Fortran 2003 if it does not.
 AC_DEFUN([PAC_PROG_FC_HAVE_F2003_REQUIREMENTS],[
    AC_MSG_CHECKING([if Fortran compiler version compatible with Fortran 2003 HDF])
     HAVE_FORTRAN_2003="no"
-	
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[
 
 	USE iso_c_binding
 	IMPLICIT NONE