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

[luis at geodynamics.org]

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

Modified:
   cs/cigma/trunk/configure.ac
Log:
Updated configure.ac file

 - Added AM_CONDITIONAL statements for use in makefile
 - Updated configuration summary with new flags

Modified: cs/cigma/trunk/configure.ac
===================================================================
--- cs/cigma/trunk/configure.ac	2008-12-10 02:15:36 UTC (rev 13599)
+++ cs/cigma/trunk/configure.ac	2008-12-10 02:15:38 UTC (rev 13600)
@@ -15,61 +15,77 @@
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 
+dnl Check for various programs
+AC_PROG_CPP
+
+dnl See if we need a .exe extension on executables
+AC_EXEEXT
+
+dnl Check for the standard math library
+AC_CHECK_LIB(m,main)
+
 dnl Use C++ for all compilation tests
 AC_LANG(C++)
 
-dnl Configure Boost (XXX: move this step to cigma.m4)
+
+dnl Check for Python
+AM_PATH_PYTHON(2.4, :)
+if [ test "$PYTHON" != : ]; then
+    AM_CONDITIONAL(HAVE_PYTHON, true)
+else
+    AM_CONDITIONAL(HAVE_PYTHON, false)
+fi
+
+dnl Check for numpy
+CIGMA_CHECK_NUMPY
+if [ test "$PYTHON_NUMPY" != "1" ]; then
+    AC_MSG_ERROR([[Could not import the numpy python module. Please ensure it is installed correctly and is available in your PYTHONPATH]])
+fi
+CIGMA_PATH_NUMPY
+
+
+dnl Configure Boost
 AX_BOOST_BASE([1.33])
 AX_BOOST_FILESYSTEM
 AX_BOOST_PROGRAM_OPTIONS
+
 DEB_AX_PYTHON
 echo "PYTHON_BIN is '$PYTHON_BIN'"
 echo "PYTHON_INCLUDE_DIR is '$PYTHON_INCLUDE_DIR'"
 echo "PYTHON_LIB is '$PYTHON_LIB'"
+
 DEB_AX_BOOST_PYTHON
 echo "BOOST_PYTHON_LIBS is '$BOOST_PYTHON_LIBS'"
 if test -z "$BOOST_PYTHON_LIBS"; then
     AC_MSG_ERROR([[boost::python could not be found. Please ensure that LDFLAGS is configured properly, or specify --with-boost]])
 fi
 
-dnl Check for Python
-AM_PATH_PYTHON(2.4, :)
-if [test "$PYTHON" != :]; then
-    AM_CONDITIONAL(HAVE_PYTHON, true)
-else
-    AM_CONDITIONAL(HAVE_PYTHON, false)
-fi
 
 dnl Configure HDF5 library
 CIGMA_OPTIONS_HDF5
 CIGMA_PATH_HDF5
+AM_CONDITIONAL(HAVE_HDF5, [test x${with_hdf5} = xyes])
 
-dnl Check for numpy
-AC_CHECK_PYTHON_NUMPY
-if [test "$PYTHON_NUMPY" != "1"]; then
-    AC_MSG_ERROR([[Could not import the numpy python module. Please ensure it is installed correctly and is available in your PYTHONPATH]])
-fi
 
-dnl Configure CppUnit (XXX: move this step to cigma.m4)
+dnl Configure VTK library
+CIGMA_OPTIONS_VTK
+CIGMA_PATH_VTK
+AM_CONDITIONAL(HAVE_VTK, [test x${with_vtk} = xyes])
+
+
+dnl Configure CppUnit
 AM_PATH_CPPUNIT([1.12.0],
-                [withcppunit=yes],
-                [withcppunit=no; AC_MSG_RESULT([no. Unit tests disabled])])
-AM_CONDITIONAL(BUILD_CPPUNIT_TESTS, [test x${withcppunit} = xyes])
+                [with_cppunit=yes],
+                [with_cppunit=no; AC_MSG_RESULT([no. Unit tests disabled])])
+AM_CONDITIONAL(BUILD_CPPUNIT_TESTS, [test x${with_cppunit} = xyes])
 
+
 dnl XXX: Update DISTCHECK_CONFIGURE_FLAGS (see m4 macros in gitosis branch)
 AC_SUBST([DISTCHECK_CONFIGURE_FLAGS],["$DISTCHECK_CONFIGURE_FLAGS"])
 
-dnl Check for various programs
-AC_PROG_CPP
 
-dnl See if we need a .exe extension on executables
-AC_EXEEXT
 
-dnl Check for the standard math library
-AC_CHECK_LIB(m,main)
-
 dnl Write output
-
 AC_CONFIG_FILES([
     Makefile
     build/rebuild.sh
@@ -84,12 +100,16 @@
 echo "- C compiler   : $CC"
 echo "- C++ compiler : $CXX"
 
-echo "- Python binary      : $PYTHON_BIN"
-echo "- Python header path : $PYTHON_INCLUDE_DIR"
-echo "- Python library     : -l$PYTHON_LIB"
-echo "- NumPy library      : $PYTHON_NUMPY"
+echo "-"
+echo "- PYTHON               : $PYTHON"
+echo "- PYTHON_BIN           : $PYTHON_BIN"
+echo "- PYTHON_INCLUDE_DIR   : $PYTHON_INCLUDE_DIR"
+echo "- PYTHON_LIBS          : $PYTHON_LIBS"
+echo "- PYTHON_NUMPY         : $PYTHON_NUMPY"
+echo "- PYTHON_NUMPY_VERSION : $PYTHON_NUMPY_VERSION"
 
 # if using cigma_boost.m4
+#echo "-"
 #echo "- BOOST_CPPFLAGS                : $BOOST_CPPFLAGS"
 #echo "- BOOST_FILESYSTEM_LDFLAGS      : $BOOST_FILESYSTEM_LDFLAGS"
 #echo "- BOOST_FILESYSTEM_LIBS         : $BOOST_FILESYSTEM_LIBS"
@@ -97,6 +117,7 @@
 #echo "- BOOST_PROGRAM_OPTIONS_LIBS    : $BOOST_PROGRAM_OPTIONS_LIBS"
 
 # if using ax_boost_*.m4
+echo "-"
 echo "- BOOST_CPPFLAGS            : $BOOST_CPPFLAGS"
 echo "- BOOST_LDFLAGS             : $BOOST_LDFLAGS"
 echo "- BOOST_FILESYSTEM_LIB      : $BOOST_FILESYSTEM_LIB"
@@ -104,11 +125,19 @@
 echo "- BOOST_PYTHON_LIBS         : $BOOST_PYTHON_LIBS"
 
 # HDF5 flags
-echo "- HDF5_INCLUDES : $HDF5_INCLUDES"
-echo "- HDF5_LIBS     : $HDF5_LIBS"
-echo "- HDF5_LDFLAGS  : $HDF5_LDFLAGS"
+echo "-"
+echo "- HDF5_INCLUDES  : $HDF5_INCLUDES"
+echo "- HDF5_LIBS      : $HDF5_LIBS"
+echo "- HDF5_LDFLAGS   : $HDF5_LDFLAGS"
 
+# VTK flags
+echo "-"
+echo "- VTK_INCLUDES   : $VTK_INCLUDES"
+echo "- VTK_LDFLAGS    : $VTK_LDFLAGS"
+echo "- VTK_LIBS       : $VTK_LIBS"
+
 # CppUnit flags
+echo "-"
 echo "- CPPUNIT_CFLAGS : $CPPUNIT_CFLAGS"
 echo "- CPPUNIT_LIBS   : $CPPUNIT_LIBS"