[cig-commits] r13822 - cs/cigma/trunk

[luis at geodynamics.org]

Author: luis
Date: 2009-01-12 14:09:43 -0800 (Mon, 12 Jan 2009)
New Revision: 13822

Modified:
   cs/cigma/trunk/configure.ac
Log:
Updates to configure.ac

 * Fixed typo
 * Fail if HDF5 library not found
 * Commented out CIGMA_BOOST_PYTHON macro

Modified: cs/cigma/trunk/configure.ac
===================================================================
--- cs/cigma/trunk/configure.ac	2009-01-12 22:09:42 UTC (rev 13821)
+++ cs/cigma/trunk/configure.ac	2009-01-12 22:09:43 UTC (rev 13822)
@@ -62,12 +62,12 @@
 
 
 dnl Configure Boost.Python
-if test "x${with_python}" = xyes; then
-    CIGMA_BOOST_PYTHON
-    if test -z "$BOOST_PYTHON_LIB"; then
-        AC_MSG_ERROR([[boost::python could not be found. Please ensure that LDFLAGS is configured properly, or specify --with-boost]])
-    fi
-fi
+#if test "x${with_python}" = xyes; then
+#    CIGMA_BOOST_PYTHON
+#    if test -z "$BOOST_PYTHON_LIB"; then
+#        AC_MSG_ERROR([[boost::python could not be found. Please ensure that LDFLAGS is configured properly, or specify --with-boost]])
+#    fi
+#fi
 AM_CONDITIONAL([COND_BOOST_PYTHON], [test -n "$BOOST_PYTHON_LIB"])
 
 dnl Check whether to use distutils (XXX: change default to yes)
@@ -81,6 +81,9 @@
 dnl Configure HDF5 library
 CIGMA_OPTIONS_HDF5
 CIGMA_PATH_HDF5
+if test -z "$HDF5_LIBS"; then
+    AC_MSG_ERROR([[HDF5 library could not be found. Please ensure that LDFLAGS is configured properly, or specify --with-hdf5]])
+fi
 if test "${with_hdf5}" != "no"; then
     with_hdf5=yes
 fi
@@ -91,7 +94,7 @@
 CIGMA_OPTIONS_VTK
 CIGMA_PATH_VTK
 if test "${with_vtk}" != "no"; then
-    with_hdf5=yes
+    with_vtk=yes
 fi
 AM_CONDITIONAL(COND_VTK, [test "x${with_vtk}" = xyes])