[cig-commits] r18565 - short/3D/PyLith/trunk

[brad at geodynamics.org]

Author: brad
Date: 2011-06-09 07:47:10 -0700 (Thu, 09 Jun 2011)
New Revision: 18565

Modified:
   short/3D/PyLith/trunk/TODO
   short/3D/PyLith/trunk/configure.ac
Log:
Updated configure to use HDF5 macros.

Modified: short/3D/PyLith/trunk/TODO
===================================================================
--- short/3D/PyLith/trunk/TODO	2011-06-09 13:44:04 UTC (rev 18564)
+++ short/3D/PyLith/trunk/TODO	2011-06-09 14:47:10 UTC (rev 18565)
@@ -15,6 +15,7 @@
   cygwin
     don't run tests_auto
 
+
 ----------------------------------------
 BUGS
 ----------------------------------------
@@ -57,13 +58,13 @@
 * field split [BRAD]
     document what happens with field split and the null space
 
-* numerical damping [BRAD]
 
 * subduction example [BRAD]
 
 * Proofread
   + 3d/tet4 (split into steps with field split and global refinement)
   + global refinement
+  + numerical damping
 
 
 

Modified: short/3D/PyLith/trunk/configure.ac
===================================================================
--- short/3D/PyLith/trunk/configure.ac	2011-06-09 13:44:04 UTC (rev 18564)
+++ short/3D/PyLith/trunk/configure.ac	2011-06-09 14:47:10 UTC (rev 18565)
@@ -86,7 +86,7 @@
 	  CPPFLAGS="-DENABLE_HDF5 $CPPFLAGS"; export CPPFLAGS
 	  PYLITH_SWIG_CPPFLAGS="-DENABLE_HDF5 $PYLITH_SWIG_CPPFLAGS"; export PYLITH_SWIG_CPPFLAGS
           else enable_hdf5=no; fi],
-	[enable_hdf5=no])
+	[enable_hdf5=yes])
 AM_CONDITIONAL([ENABLE_HDF5], [test "$enable_hdf5" = yes])
 
 # CUDA
@@ -205,22 +205,9 @@
 
 # HDF5
 if test "$enable_hdf5" = "yes" ; then
-  AC_REQUIRE_CPP
-  AC_LANG(C++)
-  hdf5_save_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$PETSC_CC_INCLUDES $PETSC_CXX_INCLUDE $CPPFLAGS"  
-  AC_CHECK_HEADER([hdf5.h], [], [
-    AC_MSG_ERROR([HDF5 header not found.])
-  ])
-  AC_MSG_CHECKING([for H5Fopen in -lhdf5])
-  AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM([[#include <hdf5.h>]],
-	             [[H5Fopen("test.h5", H5F_ACC_TRUNC, H5P_DEFAULT);]])],
-    [AC_MSG_RESULT(yes)],
-    [AC_MSG_RESULT(no)
-     AC_MSG_ERROR([hdf5 library not found.])
-  ])
-  CPPFLAGS=$hdf5_save_CPPFLAGS
+  CIT_HDF5_HEADER
+  CIT_HDF5_LIB
+  CIT_HDF5_LIB_PARALLEL
 fi
 
 # CUDA