[cig-commits] commit: Make m4 files work with latest autoconf

[Mercurial]

changeset:   11:caac42090c58
user:        Walter Landry <wlandry at caltech.edu>
date:        Wed May 02 06:38:00 2012 -0700
files:       config/aclocal.m4 config/casc_hdf5.m4 config/casc_xlc.m4
description:
Make m4 files work with latest autoconf


diff -r 4e3ac0f6b796 -r caac42090c58 config/aclocal.m4
--- a/config/aclocal.m4	Fri Mar 18 19:48:26 2011 -0700
+++ b/config/aclocal.m4	Wed May 02 06:38:00 2012 -0700
@@ -2918,7 +2918,7 @@ if test "${hdf5_PREFIX+set}" = set; then
    # NOTE lib z and m were from BTNG macro.
    LIBS="${LIBS} ${hdf5_LIBS} $zlib_LIBS $szlib_LIBS -lm "
    CXXFLAGS="${CXXFLAGS} ${hdf5_INCLUDES}"
-   AC_LINK_IFELSE([
+   AC_LINK_IFELSE([AC_LANG_SOURCE([
       #include "hdf5.h"
       #define FILE "file.h5"
 
@@ -2933,7 +2933,7 @@ if test "${hdf5_PREFIX+set}" = set; then
          /* Terminate access to the file. */
          status = H5Fclose(file_id); 
      }
-      ], 
+      ])], 
       casc_hdf5_compile=yes,
       casc_hdf5_compile=no)
    CASC_POP_COMPILER_STATE
@@ -4773,13 +4773,13 @@ AC_DEFUN([CASC_CXX_STD_FILL_N_RETURNS_VO
    AC_MSG_CHECKING(whether std:fill_n returns void)
    AC_LANG_PUSH(C++)
    CASC_PUSH_COMPILER_STATE
-   AC_COMPILE_IFELSE([
+   AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 
       #include <vector>
 
       template void std::fill_n<unsigned int*, int, int>(unsigned int*, int, int const&);      
 
-      ], 
+      ])], 
       casc_std_fill_n_returns_void=yes,
       casc_std_fill_n_returns_void=no)
    CASC_POP_COMPILER_STATE
diff -r 4e3ac0f6b796 -r caac42090c58 config/casc_hdf5.m4
--- a/config/casc_hdf5.m4	Fri Mar 18 19:48:26 2011 -0700
+++ b/config/casc_hdf5.m4	Wed May 02 06:38:00 2012 -0700
@@ -58,7 +58,7 @@ if test "${hdf5_PREFIX+set}" = set; then
    # NOTE lib z and m were from BTNG macro.
    LIBS="${LIBS} ${hdf5_LIBS} $zlib_LIBS $szlib_LIBS -lm "
    CXXFLAGS="${CXXFLAGS} ${hdf5_INCLUDES}"
-   AC_LINK_IFELSE([
+   AC_LINK_IFELSE([AC_LANG_SOURCE([
       #include "hdf5.h"
       #define FILE "file.h5"
 
@@ -73,7 +73,7 @@ if test "${hdf5_PREFIX+set}" = set; then
          /* Terminate access to the file. */
          status = H5Fclose(file_id); 
      }
-      ], 
+      ])], 
       casc_hdf5_compile=yes,
       casc_hdf5_compile=no)
    CASC_POP_COMPILER_STATE
diff -r 4e3ac0f6b796 -r caac42090c58 config/casc_xlc.m4
--- a/config/casc_xlc.m4	Fri Mar 18 19:48:26 2011 -0700
+++ b/config/casc_xlc.m4	Wed May 02 06:38:00 2012 -0700
@@ -10,13 +10,13 @@ AC_DEFUN([CASC_CXX_STD_FILL_N_RETURNS_VO
    AC_MSG_CHECKING(whether std:fill_n returns void)
    AC_LANG_PUSH(C++)
    CASC_PUSH_COMPILER_STATE
-   AC_COMPILE_IFELSE([
+   AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 
       #include <vector>
 
       template void std::fill_n<unsigned int*, int, int>(unsigned int*, int, int const&);      
 
-      ], 
+      ])], 
       casc_std_fill_n_returns_void=yes,
       casc_std_fill_n_returns_void=no)
    CASC_POP_COMPILER_STATE