[cig-commits] r13596 - cs/cigma/trunk/config

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:15:29 -0800 (Tue, 09 Dec 2008)
New Revision: 13596

Modified:
   cs/cigma/trunk/config/cigma_hdf5.m4
Log:
Check for HDF5 C++ API at configure time

Modified: cs/cigma/trunk/config/cigma_hdf5.m4
===================================================================
--- cs/cigma/trunk/config/cigma_hdf5.m4	2008-12-10 02:15:27 UTC (rev 13595)
+++ cs/cigma/trunk/config/cigma_hdf5.m4	2008-12-10 02:15:29 UTC (rev 13596)
@@ -50,14 +50,21 @@
 
             AC_MSG_RESULT([yes])
 
-            AC_CHECK_LIB(hdf5,main,[hdf5lib="OK"])
+            AC_CHECK_LIB([hdf5],[main],[hdf5lib=yes])
+            AC_CHECK_LIB([hdf5_cpp],[main],[hdf5cpplib=yes])
+            AC_CHECK_HEADERS([H5Cpp.h],,AC_MSG_ERROR(HDF5 C++ headers not found))
 
             #HDF5_CFLAGS="-I$HDF5_PREFIX/include"
             #HDF5_CXXFLAGS="$HDF5_CFLAGS"
 
             HDF5_INCLUDES="-I$HDF5_PREFIX/include"
-            HDF5_LIBS="-lhdf5 -lz"
+            HDF5_LIBS="-lhdf5 -lhdf5_cpp -lz"
             HDF5_LDFLAGS="-L$HDF5_PREFIX/lib $HDF5_LIBS"
+
+            AC_SUBST(HDF5_INCLUDES)
+            AC_SUBST(HDF5_LIBS)
+            AC_SUBST(HDF5_LDFLAGS)
+
             $1
 
         fi
@@ -78,6 +85,10 @@
 # CIGMA_PARALLEL_HDF5(if-parallel, if-not)
 #
 AC_DEFUN([CIGMA_PARALLEL_HDF5],[
+
+    # Check for large file support
+    # AC_SYS_LARGEFILE
+
     cigma_save_CPPFLAGS=$CPPFLAGS
     cigma_save_LDFLAGS=$LDFLAGS
     cigma_save_LIBS=$LIBS